updates
Merge branch 'master' of https://github.com/bun5jp/visualemotion into katagiri

Conflicts:
	app/views/contacts/index.html.erb

updates
fix gemfiles
Merge pull request #9 from bun5jp/katagiri

Katagiri