Merge branch 'master' of github.com:bepetersn/Python-Hackpad-API

Conflicts:
	setup.py
Merge branch 'master' of github.com:bepetersn/python_hackpad_api

Conflicts:
	setup.py