add 4 player support
Merge branch 'multiplayer' of https://github.com/xelliotpenguin/mapgame into multiplayer
four player model"
resolve conflict