merging
now with a readme!
most recent version