Merged README into master