Initial Commit
Resolved .gitignore merge conflicts.