Multiple Ship Support
Merge branch 'master' of https://github.com/AdmiralPotato/ggj2013

Conflicts:
	Server/Web/Ship.cs
	Server/Web/Views/Game/Index.cshtml