my first commit
Merge branch 'master' of https://github.com/jerss2k/SER215-Project

Conflicts:
	Test.java

^O
Merge branch 'master' of https://github.com/jerss2k/SER215-Project

Conflicts:
	Test.java