Merge pull request #53 from LI-HE/gh-pages

solved the major bug of game not updateing, minor bugs to solve and GUI need fix
change back
Merge pull request #54 from ruijunhuang2010/gh-pages

change back
normal play game page
update controller.js for normal play game
Merge pull request #55 from ruijunhuang2010/gh-pages

normal play page
Update controllers.js
Merge pull request #12 from SMU-SIS/gh-pages

update