service page proposal
Merge branch 'master' of https://github.com/headphonesjones/Blohaute

Conflicts:
	templates/base.html