Merge pull request #204 from BuracayBeach/Team_5_Version_2.0

YOLO SWAG
pagination now scales when there are too many pages
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team3_v2.5
Merge pull request #205 from BuracayBeach/team3_v2.5

Team3 v2.5
Updated some files that are mine. MINE!
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into Team_5_Version_2.0