Merge branch 'master' into issue-6
Merge branch 'master' into issue-6
 changed text on button, removed "you are a follower" text
changed button name to FOLLOW for consistancy
Merge branch 'master' into issue-6
Changed FOLLOW channel to Follow Channel
Merge pull request #24 from HN23/issue-6

Issue 6
changed names to be more consistant, added pagination test cases, and pagination navigation changes
Merge branch 'master' into PaginationReplacement

Conflicts:
	db.sqlite3
changed from while to for loop while testing pagination navigation pages