did some improvements (gui, old resample technique, crossfading pos)
Merge branch 'master' of https://github.com/eyeswideopen/AirScratch
did some merging
Merge branch 'master' of https://github.com/eyeswideopen/AirScratch

Conflicts:
	fastController.py
	fastLeapController.py
Merge branch 'master' of https://github.com/eyeswideopen/AirScratch
Merge branch 'master' of https://github.com/eyeswideopen/AirScratch
created and adjusted new gui