Merge pull request #1 from cloudspokes/master

merge from upstream
code arena
before merge 2
fixed some issues
duplicate file

already have gruntfile.js
Merge pull request #2 from amethystlei/master

TC Arena HTML5 - Code Arena Page