あいうえお
Merge branch 'master' of https://github.com/hkw2014/VibrationAA

Conflicts:
	background.coffee
	index.html
	index.jade
	style.css
	style.styl