Merge branch 'gitTest' of http://39.108.133.138:3000/2107140204/Jason into gitTest

 Conflicts:

	src/HiGit.java