Initial commit
Merge branch 'master' of heroku.com:adambeckio
Fixed merge conflict