Initial commit
fixed gitignore conflict