This is a re-upload of my previous push
Merge branch 'master' of github.com:Jom901/iupibooks
Mixup with the pull requests. Merger needed to get new and improved template rolling.