Fix merge conflicts

spencerng · spencerng · commit 359106ae4fd7 · 2018-02-11T11:32:24.000-05:00
diff --git a/README.md b/README.md
@@ -63,4 +63,4 @@ Note that you will need Gradle to compile this repository's source code if you d
 
 ## Contact
 
-Feel free to contact me at sng1488@gmail.com or create a pull request if you have any questions, fixes, or suggestions.
+Feel free to contact me at sng1488@gmail.com or create a pull request if you have any questions, fixes, or suggestions. 

Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,4 @@ Note that you will need Gradle to compile this repository's source code if you d`
`63`	`63`
`64`	`64`	`## Contact`
`65`	`65`
`66`		`-Feel free to contact me at sng1488@gmail.com or create a pull request if you have any questions, fixes, or suggestions.`
	`66`	`+Feel free to contact me at sng1488@gmail.com or create a pull request if you have any questions, fixes, or suggestions.`