Resolve conflicts 2 (#233)

* Merging dev branch into main (#78)

* Reverting params.yaml and updating code in server_endpoint.md
* TcpServer class was renamed
* convert all files with dos2unix (#76)
* Minor tutorial tweaks, update version numbers

Co-authored-by: Devin Miller <devin.miller@unity3d.com>
Co-authored-by: Peifeng Jing <peifeng.jing@unity3d.com>

* Updating instructions for URDF repository  (#71)

* 1. Adding images for URDF tutorial 2. Adding instructions highlighting Disable Collison tag

* Adding link to example of disable collision tag in the niryo_one URDF file

* Sarah/readme update (#112)

* Adding physics roadmap and minor formatting changes

* formatting nits

* Calling out feature requests

* Update for ROS-TCP-Connector namespace changes

* Mpinol/simrealrebased (#107)

* Adding sim and real pnp files.

* Update with new instructions (#147)

* Update tutorial text (#148)

* AIRO-405 Adding Yamato boilerplate to Robotics Hub (...

.github/PULL_REQUEST_TEMPLATE.md

 - [ ] Updated the [Changelog](https://github.com/Unity-Technologies/Unity-Robotics-Hub/blob/dev/CHANGELOG.md) and described changes in the [Unreleased section](https://github.com/Unity-Technologies/Unity-Robotics-Hub/blob/dev/CHANGELOG.md#unreleased)
 - [ ] Updated the documentation as appropriate
 
-## Other comments
+## Other comments

tutorials/pick_and_place/2_ros_tcp.md

 
 ---
 
-#### Proceed to [Part 3](3_pick_and_place.md).
+#### Proceed to [Part 3](3_pick_and_place.md).