Edit index.html
Merge branch 'master' of https://github.com/fyoshida/FySe2014

Conflicts:
	FySe2014/.settings/com.google.appengine.eclipse.core.prefs