updates
add readme
merge damn it