Merge branch 'master' of https://github.com/LaunchAcademy/gelp into create_an_index_page
votes
fixed merge conflict
added voting feature
pagination
resolved merge conflicts
pagination fixed
finished pagination
Update README.rdoc
fixed comments
fixed merge conflict
Merge pull request #20 from LaunchAcademy/add_pagination

Finished pagination
fixed merge conflict
fixed voting feature tests
Fixed admin notes
Merge pull request #19 from LaunchAcademy/added_user_voting

Added user voting
Merge branch 'master' into Fixing_admin_notes
resolve merge conflict & merge in master