Updated .gitignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/CGame.cpp
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Added menu/button stuff
Made it compile
Merge pull request #8 from zephyrz4/master

Button/Menu stuff