tweaked line detection
Obj detection for orange traffic cones
Object detection and line detection combined
improved object detector for all colors
Merge branch 'master' of https://github.com/asidhu/sbu-igvc-2014

Conflicts:
	src/base.cpp