small changes
Merge branch 'master' of github.com:takumif/vivillon

Conflicts:
	public/javascripts/index.js
formatted the text input of Register