merge problem
Merge branch 'master' of https://github.com/dgoldberg92/tray-racer

Conflicts:
	texture/checkerboard.cpp