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

Conflicts:
	aux/point.h