#1 add footer
Merge branch 'master' of https://github.com/Asterisknautz/gittest

Conflicts:
	index.html

#1 手動で競合を解決。