igen
Merge branch 'another-branch' of https://github.com/MahApp/OnGit.git
into another-branch

Conflicts:
	Proj1/src/com/example/proj1/Allan.java