First commit
gitignore confict fix