is this thing squashed?
Hopefully this is squashed. (i still have no ideea what i'm doing)

Merge branch 'tbp-master'

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