Kujundus.
no message
Kujundus
Merge branch 'master' of github.com:JaneJ/Milou

Conflicts:
	src/main/webapp/index.htm
	src/main/webapp/resources/css/pra1.css