Initial commit of skeleton
Fixes merge conflict in gitignore from github