Readme with improvements

README.md

@@ -171,7 +171,8 @@ and we want to ensure Apollo 2.5 was integrated correctly with your vehicle befo
 
 * [Build and Release using Docker](https://github.com/ApolloAuto/apollo/blob/master/docs/howto/how_to_build_and_release.md) - This step is required
 
-* [Launch and Run Apollo](https://github.com/natashadsouza/apollo/blob/master/docs/howto/how_to_launch_Apollo.md)
+* [Launch and Run Apollo](https://github.com/ApolloAuto/apollo/blob/master/docs/howto/how_to_launch_Apollo.md)
+
 * [Apollo 1.0 QuickStart Guide](https://github.com/ApolloAuto/apollo/blob/master/docs/quickstart/apollo_1_0_quick_start.md)
 
 * [Apollo 1.5 QuickStart Guide](https://github.com/ApolloAuto/apollo/blob/master/docs/quickstart/apollo_1_5_quick_start.md)
@@ -208,11 +209,7 @@ Please refer the Disclaimer of Apollo in [Apollo's official website](http://apol
 * [Have suggestions for our GitHub page?](https://github.com/ApolloAuto/apollo/issues)
 * [Twitter](https://twitter.com/apolloplatform)
 * [YouTube](https://www.youtube.com/channel/UC8wR_NX_NShUTSSqIaEUY9Q)
-<<<<<<< HEAD
 * [Blog](https://www.medium.com/apollo-auto)
-=======
-* [Blog](https://medium.com/apollo-auto)
->>>>>>> Readme with improvements
 * [Newsletter](http://eepurl.com/c-mLSz)
 
 

docs/README.md

@@ -6,7 +6,7 @@ Apollo documents contain the following folders:
 ---
 - **[Demo Guide](demo_guide/README.md)** - A guide to setting up Apollo should you not have the Hardware necessary for Setup.
 
-- 中文版本的Demo Guide, 请点击这里 [Demo Guide]
+- 中文版本的Demo Guide, 请点击这里 [Demo Guide](demo_guide/README_cn.md)
 ---
 - **[Specs](specs/README.md)** - A Deep dive into Apollo's Hardware and Software specifications (only recommended for expert level developers that have successfully installed and launched Apollo) 
 ---