Starting to edit the map to become less blocky. Will continue once approved by rest of group.
Cleaned up the code to remove lines I had commented out/are no longer necessary
Updated sprites file
I had accidentally removed the scaling of the map sprite when making changes before, that has been added back in. Map has undergone more changes.
Changed more of the map and moved a port.
Final changes to map. Had to move ports around to fit better to the new map. Also moved the starting position of the ship to move it off land.
Final commit. GameLogic now allows ship to move along beaches. Outdated enum of LAND and WATER removed from Map.hpp.
Merge branch 'master' into map_blockyness_merge

Conflicts:
	code/data/ports.txt
	code/data/sprites.png
	code/src/GameLogic.cpp
Merge pull request #52 from fenaren/map_blockyness_merge

Map blockyness merge