no message
Merge branch 'master' of https://github.com/DevangS/halpzme

Conflicts:
	halpzme/settings.pyc