Adding assets
Merge branch 'master' into heroku
removing assets and fixing sort bug