Update README.md

README.md

@@ -1,4 +1,4 @@
-    
+
 # Year of Challenges 2017
 
 Hello and welcome to the Year of Programming 2017's challenges repository! Here
@@ -271,17 +271,10 @@ Then you can submit a pull request.
 
 Reviewing and testing code is just as important as writing it. Peer to peer review is a core component of what we're striving to accomplish with our year of programming challenge. We would appreciate it if everyone who submits a solution reviews at least one other persons submission. All submitted code should be well documented and work for the provided test cases.
 
-<<<<<<< HEAD
-Pulling seperate PR's to test code is cumbersome and we realize that. To help with this, we suggest using an online compiler so that you can check over anothers code without having to leave your browser. A good online compiler is [repl.it](https://repl.it/languages) which has many languages available to work with!
-
-###please follow these guildlines for PR reviews
-- [ ] **Code Correctness**
-=======
 Pulling seperate pull requests to test code is cumbersome and we realize that. To help with this, we suggest using an online compiler so that you can check over anothers code without having to leave your browser. A good online compiler is [repl.it](https://repl.it/languages) which has many languages available to work with!
 
 ###please follow these guildlines for pull request reviews
 - [ ] **Code correctness**
->>>>>>> ef8fde942991f07f879741733b43de5909e8fb78
 * Does the code compile and run?
 * If it compiles/runs, does it make sense? 
 - [ ] **Code Style**
@@ -295,11 +288,6 @@ Pulling seperate pull requests to test code is cumbersome and we realize that. T
 * Is the directory naming in all lower case for language and challenges?
 * The directory for the username and solution file don't follow any format
 * Encourage the use of a src/ directory for multiple files!
-<<<<<<< HEAD
-- [ ] **Merge PR**
-* Is everything good? Check this off. 
-
-=======
 - [ ] **Merge Pull Request**
 * Is everything good? Check this off. 
 
@@ -312,12 +300,9 @@ You can copy and paste this:
 - [ ] **Merge Pull Request**
 ```
 
-
 ###Review Title System
 
 When You do perform a pull request, you should set the title of it so that others know no one has looked at it yet.
-
-
 -   If you just submitted the pull request, your title should look like this: `[language]challenge_[chalNumber](UnReviewed)`
 -   If you have already recieved one review, your pull request title should look like this: `[language]challenge_[chalNumber](Pending)`
 -   If you have at least 2 reviews, set your pull request to this: `[language]challenge_[chalNumber](ReadyForMerge)` and a mod will merge your code to the main repository.