first commit
Merge branch 'master' of github.com:tthomas48/dronious

Conflicts:
	.gitignore