Merge branch 'master' of https://github.com/linlymatsumura/romantyper.js

Conflicts:
assets/css/style.less
assets/js/romantyper.js
refactoring
Merge branch 'master' of https://github.com/linlymatsumura/romantyper.js

Conflicts:
	assets/css/style.less
	assets/js/romantyper.js