change style
Merge branch 'fix_app' of github.com:xleninx/k-match into fix_app

Conflicts:
	app/models/user.rb
Merge branch 'fix_app' of github.com:xleninx/k-match into fix_app