Stubbed out flying controls and fixed errors.
Merge branch 'master' of git@github.com:landonepps/MOE.git

Conflicts:
	FGame/src/Player.h
updated init for Mac
Merge branch 'landonMOE'
Environment is now a singleton
Added pickup sound effect
Merge branch 'master' of git@github.com:landonepps/MOE.git