Merge pull request #22 from aweidner/master

Combined info entry view and startup view
Merged and Fog of War Done
Merge branch 'master' of https://github.com/CS3141-Fall2013/TSP-Project
Changed color and radius of Fog of war
Merge pull request #23 from roro330/master

Fog of war
Client can restart and connect to same server after death
Merge pull request #25 from btaidm/master

Client can restart and connect to same server after death
Fixed a typo