Updated shell more for user dao
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/thumbsup/coolnamecli/dao/UserDAO.java
Merge branch 'master' of https://github.com/destroyerdust/SWEN-343-Group6-CoolName
Fixed User entity.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/thumbsup/coolnamecli/entity/User.java