a
Merge branch 'master' of http://github.com/jakedarling/magicflight

Conflicts:
	magicflight/bin/com/magicflight/jakedean/Flier.class
	magicflight/src/com/magicflight/jakedean/Flier.java