conflict
Merge branch 'master' of https://github.com/birch0930/assignment1.git

Conflicts:
	src/main/java/ca/bcit/infosys/access/EmployeeManager.java
	src/main/resources/messages_en.properties
vv