Initial Commit
Added readme.
fixed conflict