Merge with master, add files