Fixed Healthbar Variables
Merge remote-tracking branch 'origin/master' into JesseMOE
Fixed Timer

The game needed to know the time elapsed rather than just the timer
Implemented clipping in Image class
Merge branch 'master' of https://github.com/landonepps/MOE.git
Merge branch 'AndrewMOE'
modified comments in Image for clarity
Merge remote-tracking branch 'origin/master' into landonMOE
modified includes to support OS X
added Music class and implemented bum
removed noise from music, updated poor sprite, removed temp character image
edited error message in Image class
Test Commit
Merge branch 'master' of https://github.com/landonepps/MOE

Conflicts:
	FGame/src/OnLoop.cpp
Fixed win vs. apple.