Merge branch 'dev' of https://github.com/JMtorii/toriizuka-web into dev

Conflicts:
	.htaccess
Resolve conflict