WiP
Merge branch 'master' of github.com:breach/teabag

Conflicts:
	README.md
	package.json