verison 1
Merge branch 'jawnbit' of https://github.com/jschweizer36/Flyguys into jawnbit

Conflicts:
	stuff.py

version 2 of stuff.py