add gitignore
merge with master
delete unnecessary files