Merge pull request #1 from joconno2/jim-branch

test
Test

some test stuff
Merge pull request #2 from amesbk/master

Test
Merge pull request #3 from joconno2/jim-branch

Jim branch
Created Actor

Created the basic actor class to be used by the main character of the
runner. Only basic methods implemented thus far.
Merge pull request #4 from joconno2/jim-work

Created Actor
Apparently Actor is a reserved word in libgdx

fixed that, its RunActor now
Added the Input Handler

Input Handler currently handles spacebar input to jump. Started to clean
up comments, more comments are needed throughout. Initial standard for
comments started. Next step is rendering and creating sprite sheet to
render from. Then physics.
Merge pull request #5 from joconno2/jim-work

Jim work
Added Asset Loader

Put together an asset loader to pick up sprites from a provided sprite
sheet. Spritesheet has to be in android data folder. need to set up
sheet and build animation in this file to then load and render.
Merge pull request #6 from joconno2/jim-work

Added Asset Loader
Got Textures Working

Textures and actor are loaded and functioning. The Spritesheet is in and
functioning, and the gravity works. Gravity needs tweaking, and we need
collision and scrolling.
Merge pull request #7 from joconno2/jim-work

Got Textures Working
Working on Platforms

Need to finish platforms and add collision, then movement
Merge pull request #8 from joconno2/jim-work

Working on Platforms
Commiting

Merge remote-tracking branch 'origin/jim-branch'

Conflicts:
	core/src/com/mathgaming/gameobjects/Platform.java
	core/src/com/mathgaming/gameobjects/RunActor.java
	core/src/com/mathgaming/gameworld/GameRenderer.java
	core/src/com/mathgaming/gameworld/GameWorld.java
Fixing the terrible things I did with Git just now

I broke some stuff by forcing a merge halfway through conflict
resolution