Added merchant ship spawning and movement
Updated issues
Merge branch 'master' of https://github.com/EdibleEd/IslandTrollTribes2.git

Conflicts:
	Ongoing Issues.txt