initial commit
merge conflict on readme fixed