Removed build errors
small changes
Merge branch 'master' of https://github.com/aweidner/TSP-Project

Conflicts:
	src/com/tsp/client/view/GameView.java
Merge https://github.com/CS3141-Fall2013/TSP-Project
Started working on in game HUD for players
Connecting to a server through Startup Menu now works
Merge pull request #13 from tdschenk/master

Connecting to host
Send Player Name
Player Name is recieved by the server
UDP Server thread no longer listens on loop back feed
Client sends to a given address instead of loopback
Merge branch 'master' of github.com:btaidm/TSP-Project
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
Created a veiwer to allow monitering server and testing ai
Defaulted to localhost server and name of player
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
Merge pull request #16 from btaidm/master

Server Viewer and defaults
Defualts for viewer