mingi segadus on
Merge branch 'master' of https://github.com/JaneJ/Milou

Conflicts:
	src/main/webapp/index.html