Initial commit
gitignore merge issue