footer added
contact added
Merge branch 'master' of github.com:cc86hn/hp

Conflicts:
	_layouts/default.html