Merge pull request #39 from GJST-Capstone/gregory

Gregory
lots of adjustments to get database pulls correct
so many things
Merge pull request #40 from GJST-Capstone/stacy

Stacy
adding fitvids to async fix
remove extra footer I added by accident and more database call edits
Merge pull request #41 from GJST-Capstone/stacy

remove extra footer I added by accident and more database call edits
adding page transitions
adding fix for merge conflict