Ran libgdx setup, nothing else
Reworked Magicflight.java to extend game
Hopefully this works
 i changed something
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
 booty pumper
trying the different font
Merge branch 'master' of github.com:JakeDarling/magicflight

Conflicts:
	magicflight-android/AndroidManifest.xml
	magicflight-android/bin/classes/com/jakedarling/magicflight/MainActivity.class
	magicflight-html/war/WEB-INF/classes/com/jakedarling/magicflight/client/GwtLauncher.class
	magicflight-html/war/index.html
	magicflight-robovm/bin/com/jakedarling/magicflight/RobovmLauncher.class
	magicflight-robovm/robovm.properties
	magicflight/bin/MagicFlight.gwt.xml
	magicflight/src/MagicFlight.gwt.xml
Revert "trying the different font"

This reverts commit f6ad61d45387178ee758d131f99a4f037103ff70.

Conflicts:
	magicflight/bin/com/magicflight/jakedean/MagicFlight.class
	magicflight/bin/com/magicflight/jakedean/MainMenuScreen.class
	magicflight/src/com/magicflight/jakedean/MagicFlight.java
	magicflight/src/com/magicflight/jakedean/MainMenuScreen.java
Revert "Revert "trying the different font""

This reverts commit 36ce142d68d296e347767788a64be3bb500dad4a.
Added Gas class and collectable interface in preparation for using them with a contactlistener
Merge branch 'master' of github.com:jakedarling/magicflight