Initial working copy
Added gitignore
Committing merge tracking