change encoding
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1

Conflicts:
	lib/user.rb