Kujundus ja aja js.
Merge branch 'master' of github.com:JaneJ/Milou
Kujundus.
Merge branch 'master' of github.com:JaneJ/Milou
Pidin commitima, et alla tõmmata.
Merge branch 'master' of github.com:JaneJ/Milou

Conflicts:
	src/main/webapp/index.html
	src/main/webapp/resources/css/minu.css
Merge branch 'master' of github.com:JaneJ/Milou

Conflicts:
	src/main/webapp/resources/css/minu.css
Merge branch 'master' of github.com:JaneJ/Milou