kjg
Merge branch 'master' of https://github.com/C2V3N/termin.git

Conflicts:
	termin-web/src/main/java/com/acme/termin/data/UserDAOImpl.java