git ignore
Merge branch 'master' of github.com:yurakuzh/mafia
fixed name instead of user_name in user model