editing launch file to launch things

Conflicts:
	launch/netbook.launch
Merge branch 'master' of https://github.com/rss-2014-team-6/rss-team-6-state-machine

Conflicts:
	launch/netbook.launch
Merge branch 'master' of https://github.com/rss-2014-team-6/rss-team-6-state-machine

Conflicts:
	launch/netbook.launch