work on templates
Merge branch 'master' into email-templates
bloop
Merge branch 'master' of github.com:vaidehijoshi/Clipboard
templates now work with guardian and student instance variables
Merge branch 'master' of github.com:vaidehijoshi/Clipboard
Merge branch 'email-templates'