zxczx
Merge branch 'master' of https://github.com/NCuculova/Roommates.git

Conflicts:
	src/main/webapp/resources/js/controllers.js