initial commit
fixing merge conflict on readme file