form テスト
Merge branch 'renewal-2014' of https://github.com/wcl48/wcl48.github.com into renewal-2014

Conflicts:
	assets/js/main.coffee
	assets/js/main.js