Fix merge

README.md

@@ -137,8 +137,10 @@ A collective list of JSON APIs for use in web development.
 | Medium | community of readers and writers offering unique perspectives on ideas. | Yes | [Go!](https://github.com/Medium/medium-api-docs)
 | Flickr | Flickr Services | Yes | [Go!](https://www.flickr.com/services/api/)
 | Reddit | Homepage of the internet | Parts | [Go!](https://www.reddit.com/dev/api)
+<<<<<<< HEAD
 | 500px |  Photography Community | Yes | [Go!](https://github.com/500px/api-documentation)
 | HackerNews | Social news for CS and entrepreneurship | No | [Go!](https://github.com/HackerNews/API)
+| Genius | Crowdsourced lyrics and music knowledge | Yes | [Go!](https://docs.genius.com/)
 
 ### Music
 | API | Description | OAuth |Link |