Initial commit
fixed conflict in .gitignore