adding page transitions
adding fix for merge conflict
Merge pull request #42 from GJST-Capstone/gregory

Gregory
Merge pull request #43 from GJST-Capstone/stacy

remove unnecessary comments and comment out console.logs but left in the...
moving page load transitions to main.js
adding multi view styles and background imgs
Merge branch 'master' into gregory
Merge pull request #44 from GJST-Capstone/gregory

Gregory
fix merge conflict