initial commit
merged conflicts with readme