login
Merge branch 'master' of https://github.com/JaneJ/Milou
Üleliigsed sulud.
Merge branch 'master' of heroku.com:milou

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