fix #14
Merge branch 'develop' of github.com:yuruga/TechCrunchTokyo2014 into feature/#14

Conflicts:
	www/index.html
Merge branch 'develop' of github.com:yuruga/TechCrunchTokyo2014 into feature/#14
fix #14
Merge branch 'feature/#14' into develop

Conflicts:
	www/index.html