Simple server implementation added. World added. Some basic game objects added.
Spaces replaced with tabs
Updates from server branch merged