lol
Merge branch 'master' of https://github.com/yumikohey/a3cube

Conflicts:
	css/style.css
	index.html