Add 'About' and 'Contact' pages
Merge branch 'master' of https://github.com/trevorcsmith/maple_street