initial commit
Merge branch 'master' of github.com:mfroehlich/flightplan

Conflicts:
	.gitignore