Fix up templates
Resolve merge conflicts
Fix search template
Merge pull request #40 from stuycs-softdev/ben

Fix up templates