Initial Repository Commit
Updated .gitignore to GitHub defaults for C++
Fix merge conflict.