appointment
fixed appointment conflict
Merge branch 'master' of github.com:yurakuzh/mafia
Merge branch 'master' of github.com:yurakuzh/mafia
fixed tab