adjust weather calls
Merge branch 'master' of github.com:GJST-Capstone/Capstone-Project
Merge pull request #34 from GJST-Capstone/stacy

Stacy
removing a few commented out stuff
fixing merge confilit
Merge pull request #35 from GJST-Capstone/gregory

Gregory
adding viewport
Merge pull request #36 from GJST-Capstone/gregory

adding viewport
add more select options for focus areas
Merge pull request #37 from GJST-Capstone/stacy

add more select options for focus areas
fix text captialization in select descriptions
Merge pull request #38 from GJST-Capstone/stacy

fix text captialization in select descriptions
adding a few changes
Merge branch 'master' into gregory
adding back to top link
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