filled in some elements on the template page
Merge branch 'master' of https://github.com/cacois/boxcar