Delete Thumbs.db
Merge branch 'master' of https://github.com/mreist/Team-Titan

Conflicts:
	SpeedSolver/images/Thumbs.db
Delete Thumbs.db
Merge remote-tracking branch 'origin/master' into Nick's-Branch