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

Conflicts:
	.htaccess
Resolve conflict
Added "About" page
Merge pull request #15 from JMtorii/dev

Added "About" section