week one - made significant changes to templates
Merge remote-tracking branch 'github2/master'