physics manager fixes
properties
Merge branch 'marshall' into temp
Merge branch 'temp' of https://github.com/tylerl0706/CoffeeSim into temp
bug fix
Merge branch 'tyler' into temp
bug fix
Merge branch 'marshall' into temp
prop
gitignore
added background in game