Merge branch 'CNphan-master'

Merging Christie's jade templates into repository.
Merge branch 'master' of https://github.com/BClark-Grad-Project/CP546
Made corrections to indentation errors and some formating errors.