no message
Merge branch 'master' of https://github.com/laki89/newGitTest

42177cdcaf0f415d34ae8b5c3ca6.

Conflicts:
	index.html