back out
testedit
...
Merge branch 'master' of https://github.com/mattbellis/Siena_College_Daniel_Loman

Conflicts:
	Github/python_examples/test.py