Automat.
Merge branch 'master' of https://github.com/JaneJ/Milou
Merge branch 'master' of heroku.com:milou
Merge branch 'master' of heroku.com:milou
Committing to pull.
Why on earth do I have to merge?

Merge branch 'master' of heroku.com:milou

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