initial commit
solved conflict with readme file