add
Merge branch 'master' of https://github.com/kyohei1234/rakuraku

Conflicts:
	apps/frontend/templates/layout.php
edited top page