Assignment 1 solution
Merge branch 'master' of https://github.com/aidendeom/comp387-a2

Conflicts:
	.classpath