Added gitignore, merged