update entity, edit commit log
merge code
add gitignore