Initial commit - skeleton
Fix merge for .gitignore