Timmy goes balls deep
Merge branch 'master' of https://github.com/TimmyToo/tester

Conflicts:
	logik.py

Edited the merge, i think