initial commit
corrected readme, merge confligt