Correctly Set up Eclipse Project

Also added SDL Library Folder
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game.cpp