Merge pull request #1 from Johnidel/master

pull
Merge pull request #2 from Johnidel/master

pull
blah
Merge remote-tracking branch 'origin/master'

Conflicts:
	Main.py
a
Revert "a"

This reverts commit ee50c5ad60591b4730a809ff1bac7375ddbb6350.
changgesss