GOT SOME CHANGES THAT differs local copy with remote committed repo
add different beginning to readme
merge remote/dev and local dev, leave comflict msg in file