updates
Merge branch 'master' of https://github.com/dmelgarm/dissertation
Merge branch 'master' of https://github.com/dmelgarm/dissertation
Updates