ignore backup files
added UOL open day stuff and TTS to linda
made a catkin package
removed scitos dep to work on the desktop
Merge branch 'master' into linda-stable
changed to reflect new refactored package structures
tidied up
added PTU
Merge branch 'master' into linda-stable
changed to match new file system layout
Update linda-base.launch

Included the cmd_vel_mux into the standard set-up
Merge branch 'master' of https://github.com/strands-project/strands_systems into linda-stable
Merge branch 'master', remote-tracking branch 'origin' into linda-stable
Merge branch 'master' into linda-stable
Merge branch 'master' into linda-stable
Update README.md

I removed the e.g. when creating catkin_ws since it is confusing and it is desirable that everybody uses this name for their workspace.
Merge branch 'master' of github.com:strands-project/strands_systems into linda-stable
Merge pull request #9 from cdondrup/master

Just tested the desktop and robot installation. Works fine for me.
Don't forget to merge your wstool workspace with the new file before updating.
Update README.md
Renamed scitos_3d_mapping_and_navigation to scitos_3d_mapping