Can read ints and shorts, strings are still an issue
Merge branch 'master' into networkSpeed

Conflicts:
	src/com/tsp/client/ClientMain.java
Started working on the killfeed feature
Killfeed is now working
Merge branch 'master' of https://github.com/CS3141-Fall2013/TSP-Project
Merge pull request #31 from CS3141-Fall2013/master

Update Dev
Merge branch 'master' of https://github.com/CS3141-Fall2013/TSP-Project
Merge pull request #32 from aweidner/master

Killfeed is now working
Merge branch 'development' into networkSpeed
Merge branch 'networdSpeed' into development-copy

Conflicts:
	src/com/tsp/client/model/GameModel.java
	src/com/tsp/client/view/GameView.java
	src/com/tsp/server/model/ServerModel.java
Messaging on server fixed
Merge pull request #35 from btaidm/development

Calculations on server
Merge branch 'master' into development
Merge branch 'development' of https://github.com/CS3141-Fall2013/TSP-Project
Added health potions, not totally functional yet
Added health potions, not totally functional yet
health potions
health potions
Merge branch 'development' of https://github.com/CS3141-Fall2013/TSP-Project
Added kd tuple for tracking kd statistics