Cleaned up
Merge branch 'master' of github.com:someatoms/Hage-DAT076
Merge branch 'master' of github.com:someatoms/Hage-DAT076

Conflicts:
	src/main/java/com/dat076hage/hage/controllers/PostController.java
	src/main/java/com/dat076hage/hage/controllers/UserController.java