Initial commit
solve gitignore conflicts