Uncommented line that used ROS time to run simulations
Merge branch 'master' of https://github.com/vptarmigan/AU_UAV_ROS
Merge branch 'master' of https://github.com/vptarmigan/AU_UAV_ROS
"pre merge commit"
Merge branch 'master' of https://github.com/vptarmigan/AU_UAV_ROS

Conflicts:
	AU_UAV_stack/AU_UAV_ROS/src/planeObject.cpp