Add basic info to readme
Merge branch 'master' into initial_setup