added README. Fixed some indentation.
fixed merge conflict