Started working on in game HUD for players
Merge branch 'master' of https://github.com/CS3141-Fall2013/TSP-Project

Conflicts:
	src/com/tsp/client/view/GameView.java
Added in a basic hud displaying the current floor, health, and
weapon being used.  Ran into a bug where the player name is not
actually being recorded by the server.  It should show up in the upper
left hand corner if it is being recorded.
Merge pull request #14 from aweidner/master

Basic HUD implemented
Merge branch 'master' of github.com:CS3141-Fall2013/TSP-Project into btaidm-master

Conflicts:
	src/com/tsp/client/model/GameModel.java
	src/com/tsp/client/view/GameView.java