Merge branch 'master' of https://github.com/softleygroup/iflyer

Conflicts:
	fly.py