git ignore
Merge branch 'master' of https://github.com/jianshentan/cs032_game
town superclass w/ new assets
Merge branch 'master' of https://github.com/jianshentan/cs032_game