initial commit
merges things
updates readme