Added SDL_TTF
Merge branch 'master' of https://github.com/floorislava/SDL-Base

Conflicts:
	game.cpp
	game.h
	game_state.h
	intro_state.cpp
	intro_state.h