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

Gregory