Initial commit
merge .gitignore conflict