new file:   README.md
Merge branch 'master' of https://github.com/cocolem/humpback

Conflicts:
	README.md

	deleted:    README.md
	new file:   __init__.py
	new file:   logger.py