Merge pull request #1 from RoboGroup3/master

Changed the waiting time to 5 sec
After x min switches from wall follower to path follower
Some rearrangements
Merge pull request #1 from JohanJohansson/master

Updates from Johan