Merge pull request #2 from JohanJohansson/master

Updated from Johan and Qi
Merge pull request #3 from JohanJohansson/master

Last updates from Johan
Merge pull request #4 from JohanJohansson/master

Updates from Johan
Let the robot stop for a while when an object detected
Let the robot stop for 3 seconds when an object detected
Merge pull request #5 from JohanJohansson/master

Updates from Johan
Fixed merge conflict
Merge branch 'JohanJohansson-master'
Removes some leftovers from merge
Removes unused header
Merge pull request #1 from RoboGroup3/master

Last commits from Robogroup