Initial commit
add readme
merge dev