fixes merge conflicts
Merge branch 'master' of https://github.com/kthffmn/buzzfeed-1
changes index to erb, adds capitalization to app