Initial commit
Fixed file conflicts, updated .gitignore