removed public assets that are though to cause conflict
Merge branch 'master' into fix_heroku_loading
Merge pull request #37 from arieldiamond/fix_heroku_loading

Fix heroku loading