(Should commit to alex_maptest branch)

Uploading the modifications I've been making to get the TiledMap
generator working.  It still doesn't work yet, but the exception that I
am receiving, I know how to fix it, so I'll be working on that.
map stuff
elements stuff dude......
UE usefulness
updated Universal Elements table
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
Merged Michael and Main