things
updated version
added readme again, woops
merge
fixed merge for readme