everything working :)
Merge branch 'tbp-master' of https://github.com/TheBestPessimist/unittest_repo into tbp-master

Conflicts:
	unit_test/exceptional/test.py
is this thing squashed?
Merge branch 'master' of https://github.com/TheBestPessimist/unittest_repo