Ship following slightly better
Merge branch 'master' of https://github.com/seamusoneill/GamecraftCork
Updates for Pickup and Level
Cannon balls firing from right spot
Merge
I don't even know what's working now.
Fixing merge problem
Hopefully this will reveal everything I've done so far
cleaning
Mihass' stuff readded after previous merge problem
Better enemy rotation
Merge finished
Merge branch 'master' of https://github.com/seamusoneill/GamecraftCork
Collision Bug Fix
Better rotation
Merge branch 'master' of https://github.com/seamusoneill/GamecraftCork
Added logic to the hud

Added logic to the hud to show thirst  and health
Merge remote-tracking branch 'origin/master'

Conflicts:
	hudDisplay.h
Changed files to change player thirst+health
Some changes to player class