Fixed Stuff
Merge branch 'master' of https://github.com/MrJester/TekDefense

Conflicts:
	Automater.py