cleans up assets
Merging latest heroku pushed version to my local branch

Merge branch 'master' into Ori