Finished the first version of smileyweek
Merge branch 'master' of https://github.com/knutesten/tdt4900

Conflicts:
	src/main/webapp/index.html
Merge branch 'master' of https://github.com/knutesten/tdt4900