added some stuff
Merge branch 'master' of https://github.com/eyeswideopen/AirTouch

Conflicts:
	AudioController.py
	FileHandler.py
no message