Merge pull request #10 from Noahhh/homework

Homework
blank
merged from master
minor fixes, added pagination
Merge pull request #15 from ToreyStapleton/master

minor fixes, added pagination
Merge branch 'master' into homework
pushing to master