Merge pull request #57 from tbrockman/master

going to bed
Added template
Merge pull request #2 from CMPUT301F14T03/master

updating my fork