Merge pull request #10 from thinkallabout/unstable

Unstable to Testing
Merge pull request #11 from thinkallabout/testing

Testing into Master
Update README.md
Merge pull request #12 from thinkallabout/unstable

Unstable into Testing
Merge pull request #13 from thinkallabout/testing

Testing
Merge pull request #20 from thinkallabout/unstable

Unstable into Testing
Merge pull request #21 from thinkallabout/unstable

Moved assets to game/ folder & Added CONTRIBUTING
Merge pull request #22 from thinkallabout/testing

Testing into Master
Added Game.entity var
Update README.md
Merge branch 'master' of https://www.github.com/thinkallabout/argon into unstable
Modified package.json
Added package.json to root
Changed != to !== when comparing null
Added Game.entity var
Added empty semicolon
Added Gruntfile.js. Fixes #15
Resolved README.md conflict