Merge branch 'master' of https://github.com/jmachete/guidedrone

Conflicts:
	README.md