Import sprites into game objects
Merge branch 'master' of https://github.com/nairn1983/game2

Conflicts:
	GameObject.cpp
Resolve conflict. Update player to use superclass load texture function.