d
Merge branch 'master' of https://github.com/fredheir/HP

Conflicts:
	hpfunctions.py