completed show building
Merge branch 'master' of https://github.com/CodeMonkeyism/CMPT350
Test robotGroup.js
Merge branch 'master' into Model-dev
Merge branch 'refs/heads/CSS_Dev'
Add test for enemy. Loot needs discussion.
Merge branch 'master' into Model-dev
completed add res automatically
conflict
fix conflict
delete index
recreate index
Merge remote-tracking branch 'origin/master' into Xingze
includ engine.js
solve merge problem.