README Updates

README.md

@@ -106,27 +106,26 @@ Initilize rosdep:
 	copy (or add) files from px4_launch directory to '~/PX4-Autopilot/launch'
 ### MAVROS
 - in px4.launch, replace:
-'''
+
 	arg name="fcu_url" default="/dev/ttyACM0:57600" 
 	arg name="gcs_url" default="udp-b://127.0.0.1:14555@14550"
-'''
+
 - with:
-'''
+
 	arg name="fcu_url" default="udp://:14551@192.168.1.91:14556"
 	arg name="gcs_url" default="udp-b://127.0.0.1:14555@14550" 
-'''
 
 #### CHANGE DEVEL/SETUP.BASH
 In catkin_ws (or any working directory) add to devel/setup.bash:
+'''
 	CURRENT_DIR=$(pwd)
 	cd ~/PX4-Autopilot
-
 	source Tools/setup_gazebo.bash $(pwd) $(pwd)/build/px4_sitl_default
 	export ROS_PACKAGE_PATH=$ROS_PACKAGE_PATH:$(pwd)
 	export ROS_PACKAGE_PATH=$ROS_PACKAGE_PATH:$(pwd)/Tools/sitl_gazebo
 
 	cd $CURRENT_DIR
-
+'''
 ## JINJA TETHER FILE
 - spiri_with_tether.sdf.jinja can be altered to create desired tether model
 - changes nede to be made in px4 directory and will only take effect and 
@@ -136,11 +135,3 @@ In catkin_ws (or any working directory) add to devel/setup.bash:
 	- number_elements: number of segments tether will be composed of
 	- tl: segment length (should be no shorter than 0.3 meters)
 
-
-
-
-<<<<<<< HEAD
-	
-=======
-	
->>>>>>> 82c7bd26a006f5ffb4d0f2a2a6dc623552984cef