Fixing synchronization shenanigans
updating to working version
Merge branch 'master' of https://github.com/indigochill/Datafall

Conflicts:
	display.py