added the texture manager

* cleaned up merge conflics.
* added the texture manager for delaing with textures. I’m thikning it
will be driven by a SpriteHandler which will accept a sprite manifest
config
Merge branch 'master' of https://github.com/beersbr/ludum_dare_28

Conflicts:
	IEntity.cpp
	Vector.h