done
Merge branch 'master' of https://github.com/brothercrow/LAB1PROJECT2

Conflicts:
	lab1project2/src/lab1project2/project2.java