prepare for merge conflicts
Merge branch 'master' of https://github.com/lynneokada/Reddit-on-Rails