add several things
merge conflict
delete things
ignore data folder
merge with micheal