Merge branch 'master' of https://github.com/chrisdhanaraj/DEVELOPMENT
Fixing type back up. Contemplating whether to move the pagelines folder into the repo as well.