fix fsdf

fdsfa
Revert "fix fsdf"

This reverts commit 79ac367ce47921d9bd40ab5b7b2d933c1b0a9651.
gfdsgfdg
Merge branch 'master' of https://github.com/NCuculova/Roommates.git

Conflicts:
	src/main/webapp/resources/js/router.js
	src/main/webapp/resources/js/services.js