Initial commit
Merge README

Conflicts:
	README.md
Merge branch 'dev'