fixed some template code + started doing help page
Merge branch 'master' of https://github.com/Chipman/ourProject