Merge pull request #4 from zephyrz4/master

Some makefile changes
Merge pull request #5 from zephyrz4/master

Client/Server stuff
Merge pull request #6 from zephyrz4/master

stuff
Merge pull request #7 from zephyrz4/master

CGame work
A few minor changes. Started the Main Menu Design.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/CGame.cpp