cleaning up merging conflicts
Merge branch 'master' of heroku.com:pacific-tundra-6383