jf readme
merge conflict
minor errors jannisfeigl