preparing for upload to heroku
Merge branch 'master' of https://github.com/citizengit/loople
added new animations and fixed conflicts