Added SHIPIT test to app.js
Merge branch 'master' of https://github.com/Das3nde/EJ-Assets
Commented out shipit and gm code