Basic Game Stuff, Inventory System

I'm sending out an email about it, it's mostly relevant to Michael.
Fixed Race/Creature Implementation

Still need to copy methods from Creature to Race
Changed 1 thing about Michaels

Everything else is the same, except my stuff, which I added 32x32, and
some generalization based on screen size.
Merge branch 'Michael' into michael2

Conflicts:
	game/Enemy.java
	game/MainGameState.java
	orig/Creature.java
	orig/Planet.java
	orig/Test.java
Merge github.com:Cobrabb/Rougelike into Michael

Conflicts:
	game/Enemy.java
	game/MainGameState.java
	orig/Creature.java
	orig/Planet.java
	orig/Test.java
Merge branch 'michael2' into Michael

Conflicts:
	orig/Planet.java
	orig/Test.java
Working on Attacking/effects