rm unwanted files
add gitignore
merge with master