uhmm
Merge branch 'master' of https://github.com/DanCardin/pyPlatform

Conflicts:
	assets/settings.txt
probably not much, just a checkin