Merge pull request #2 from amethystlei/master

TC Arena HTML5 - Code Arena Page
trouleshooting heroku deploy
trouleshooting heroku deploy
updating gruntfile - adding heroku task
Merge pull request #3 from amethystlei/master

A quick fix for the header issue
Submission.
Cookie fix.
Final fix.
fixing https issue
Merge branch 'master' into login-logout
Merge pull request #4 from LazyChild/login-logout

login and logout submission
Update the web-arena for new sockets event name.
Merge pull request #5 from LazyChild/update_sockets_integration

sockets event integration
Merge pull request #2 from cloudspokes/master

catch up