readme
proper markdown
Merge branch 'dev'