haveged..
Merge branch 'master' of github.com:flenter/pytest-test

Conflicts:
	wercker.yml