initial commit
some edits to the list
merge conflicts solved