last check before heroku update
Merge branch 'master' of https://github.com/citizengit/loople