child.html in index.html
base template
Merge branch 'master' of http://github.com/eswalker/cos333 into ed/templates