Added name display
Started Custom world

changed couple of tile id's around
added new chiseled stone tile
Changed player starting position

removed orange spot when swimming
Merge commit '83aa3d4e1cc20d055fe086768088a138838c0acf' into Devaside

Conflicts:
	src/com/redomar/game/Game.java
Merge commit 'c377219a7ff3edd1716cea80de7c7e71212ec8db' into Devaside

Conflicts:
	src/com/redomar/game/Game.java
Multiplayer: Setting up UDP

ping pong
Merge commit 'e20e98fc1fb092908bfda9461f7baae60f5feb55' into Devaside
Multiplayer: Login packet

Buggy
Multiplayer: Removed a bug

game wouldn't load
Multiplayer: Updated the login packet
Merge branch 'aside' into Devaside

Conflicts:
	src/com/redomar/game/Game.java
Merge pull request #1 from redomar/Devaside

Updated local multiplayer to master branch