minnor changes.
Merge branch 'master' of github.com:bloodyvesp/aerials

Conflicts:
	main.m