fix merge conflicts

# Conflicts:
#	README.md

README.md

@@ -2,14 +2,68 @@
 
 A collective list of JSON APIs for use in web development.
 
-| API | Description | Link |
-|---|---|---|
-| Marvel | Marvel Comics API | [Go!](http://developer.marvel.com) |
-| SWAPI | Star Wars API | [Go!](https://swapi.co) |
-| NASA | NASA data, including imagery | [Go!](https://api.nasa.gov) |
-| Pokéapi | The RESTful Pokémon API | [Go!](http://pokeapi.co) |
-| Giphy | Get all your gifs | [Go!](https://github.com/Giphy/GiphyAPI) |
-| OMDB | Open movie database | [Go!](http://omdbapi.com) |
-| Unsplash | Photography | [Go!](https://unsplash.com/developers) |
-| UI Faces | Find and generate sample avatars for user interfaces | [Go!](http://uifaces.com/api) |
-| UI Names | Generate random fake names | [Go!](https://github.com/thm/uinames) |
+### Animals
+| API | Description | OAuth |Link |
+|---|---|---|---|
+| Petfinder | Adoption | No | [Go!](https://www.petfinder.com/developers/api-docs/) |
+
+
+### Drinks
+
+| API | Description | OAuth |Link |
+|---|---|---|---|
+| BreweryDB | Beer | No |[Go!](http://www.brewerydb.com/developers) |
+| LCBO API | Alcohol | No |[Go!](https://lcboapi.com/) |
+
+### Games & Comics
+
+| API | Description | OAuth |Link |
+|---|---|---|---|
+| Marvel | Marvel Comics API | No | [Go!](http://developer.marvel.com) |
+| SWAPI | Star Wars API | No |[Go!](https://swapi.co) |
+| Pokéapi | The RESTful Pokémon API | No |[Go!](http://pokeapi.co) |
+| Giant Bomb | Video Games | No |[Go!](http://www.giantbomb.com/api/documentation) |
+
+
+### Media
+
+| API | Description | OAuth |Link |
+|---|---|---|---|
+| Noun Project | Icons | Yes | [Go!](http://api.thenounproject.com/index.html) |
+| Unsplash | Photography | No | [Go!](https://unsplash.com/developers) |
+| Giphy | Get all your gifs | No | [Go!](https://github.com/Giphy/GiphyAPI) |
+| OMDB | Open movie database | No | [Go!](http://omdbapi.com) |
+| MovieDB | Movie Data | No | [Go!](https://www.themoviedb.org/documentation/api) |
+| Good Reads | Books | No | [Go!](https://www.goodreads.com/api) |
+| Dribble | Design | Yes | [Go!](http://developer.dribbble.com/v1/) |
+| Rijksmuseum| Art | No | [Go!](https://www.rijksmuseum.nl/en/api) |
+
+### Music
+| API | Description | OAuth |Link |
+|---|---|---|---|
+| Discogs | Music | No | [Go!](https://www.discogs.com/developers/) |
+| EchoNest | Music | No | [Go!](http://developer.echonest.com/docs/v4) |
+| LastFm | Music | No | [Go!](http://www.last.fm/api) |
+
+### Science
+
+| API | Description | OAuth |Link |
+|---|---|---|---|
+| TED Talks | TED API | No | [Go!](http://developer.ted.com/API_Docs) |
+| NASA | NASA data, including imagery | No | [Go!](https://api.nasa.gov) |
+| Wunderground | Weather | No | [Go!](http://www.wunderground.com/weather/api/) |
+| World Bank | World Data | No | [Go!](http://data.worldbank.org/developers) |
+
+### Transportation
+| API | Description | OAuth |Link |
+|---|---|---|---|
+| Transport for London | TFL API | No | [Go!](https://api.tfl.gov.uk) |
+| Transport for Belgium | Belgian transport API | No | [Go!](https://hello.irail.be/api/) |
+
+### Development
+
+| API | Description | OAuth |Link |
+|---|---|---|---|
+| RandomUser | Generates random user data | No | [Go!](https://randomuser.me/) |
+| UI Faces | Find and generate sample avatars for user interfaces | No | [Go!](http://uifaces.com/api) |
+| UI Names | Generate random fake names | No | [Go!](https://github.com/thm/uinames) |