Bugs created
Merge remote-tracking branch 'origin/master'

Conflicts:
	test.py
Merge branch 'master' of https://github.com/turboNinja2/Software

Conflicts:
	Main.py