no message
Merge branch 'master' of https://github.com/turos/hitme

Conflicts:
	index.html
no message
Merge branch 'master' of https://github.com/turos/hitme

Conflicts:
	css/custom.css
	index.html
Merge branch 'master' of https://github.com/turos/hitme