init
gitignore
some progress
merge