Resolve conflicts

README.md

@@ -13,9 +13,9 @@ Just follow [the link](https://developer.gracenote.com/) and get it there.
 
 * Copy `main.c` to `gnsdk-3.02.0.422o-20130108/samples/misucid_stream`
 * Run `make`
-* Use `./sample 'CLIENT ID' 'CLIENT TAG' ./licence.txt ./data/05-Hummingbird-sample.wav`
+* Use `./sample 'CLIENT ID' 'CLIENT TAG' ./license.txt ./data/05-Hummingbird-sample.wav`
 
-If everything is fine, you should see the followuing output:
+If everything is fine, you should see the following output:
 
 ```bash
 {"artist": "Wilco", "album": "A Ghost is Born", "title": "Hummingbird"}