Some change
Merge branch 'master' of https://github.com/jongisli/AJasgn3

Conflicts:
	assignment3/SimpleEmployeeDB.java
some change