First commit
add things to gitignore
merge
merge