add readme
add filewatcher
merge with master