sprite sheet worknig

sprite sheet worknig
Merge remote-tracking branch 'origin/master'

Conflicts:
	Boxer.cpp
Merge branch 'master' of https://github.com/curtismj1/Stick-Fight