mac commit
Merge branch 'master' of https://github.com/hrtk-84/hrtk84

Conflicts:
	css/common.css
	index.html