Initial commit

 Please enter the commit message for your changes. Lines starting
Merging conflicts with .gitignore