Merge branch 'master' of https://github.com/Polytonic/Skyhook

Conflicts:
	main.py
Merge branch 'master' of https://github.com/Polytonic/Skyhook

Conflicts:
	main.py