Add header
Merge branch 'master' of github.com:ProjectShepherd/shepherd-web
resolve merge conflicts in base.html