Commit to resolve conflicts
Change in design - employee username stored as key instead of employeeid
Merge branch 'master' of https://github.com/IDeaSCo/COS.git

Conflicts:
	src/main/java/com/ideas/domain/EmployeeRepository.java
	src/main/java/com/ideas/domain/UserDTO.java