added the hackathon_schduler to the launch file
Merge branch 'master' of https://github.com/odestcj/hackathon_aug2013

Conflicts:
	ROS/src/hackathon_scheduler/launch/launch_it.launch