Samuli's funny change
Merge branch 'master' of http://github.com/sasuomi/project1

Conflicts:
	index.html
Merge branch 'master' of http://github.com/sasuomi/project1