Merge pull request #96 from zachfalsetto/codefest2014

new template to base other pages on