commit before merge
removed unneccesary code for linefollowing, will stop at pickupstations
Merge pull request #59 from TSEA56-2014-Grupp-1/linefollowing_merge

Linefollowing merge