add player and building
Merge branch 'master' of https://github.com/wday/TurbineGameJam