Revert "stuff on stuff"

This reverts commit cc0e5cabe26914b9f0598515a760c302aa82832c.

Conflicts:
	main.py
	main.pyc