merge conflict?
Merge branch 'master' of https://github.com/UBC-Snowbots/IGVC2014

Conflicts:
	sb_lanes/src/LaneDetector.cpp