Initial commit
Updating .gitignore
Merge with new origin