Adding README.md file with vary basic content.
Fixing merge conflict

Merge branch 'master' of github.com:nocturnalwarz/Raven

Conflicts:
	README.md