Stuff
Pagination, Contact & merge conflicts
Gemfile
More merge conflict resolution
Readme