Adding Basil Poledouris - Conan the Barbarian
Merge pull request #4 from repejota/master

Adding Basil Poledouris - Conan the Barbarian
Changed some issues
Merge branch 'master_upstream'

Conflicts:
	README.md