syncing
Merge branch 'master' of https://github.com/jakedarling/magicflight

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
removed old files