moved a bunch of stuff around and started implementing gas
Revert "moved a bunch of stuff around and started implementing gas"

This reverts commit d111e897fd318faafbfb56e19eff789c47dc4ff9.
Revert "Merge pull request #7 from JakeDarling/json"

This reverts commit 889f24a2a364744f4f9a2d894bd5e153a1a887ca, reversing
changes made to 4c242153ef2a50a11b91f886c1fe9be987418e22.
Gas positioning and standard unit
swap w and h
Merge pull request #7 from JakeDarling/json

Json
run out of fuel and die
Merge branch 'master' into something

Conflicts:
	core/src/com/wtgs/games/magicflight/Coin.java
	core/src/com/wtgs/games/magicflight/Flier.java
	core/src/com/wtgs/games/magicflight/Gas.java
	core/src/com/wtgs/games/magicflight/Ground.java
Merge pull request #11 from JakeDarling/something

Running out of gas = death