Login, logout and memberProfile done!
Merge branch 'master' of https://github.com/NCuculova/Roommates.git

Conflicts:
	src/main/webapp/WEB-INF/jsp/index.jsp
	src/main/webapp/resources/js/controllers.js
	src/main/webapp/views/signup.html