Initial commit! Not quite complete yet.
Merged .gitignore