Initial commit
gitignore merge conflict fixed