Fixed merge that somehow conflicted and got past GitHub.exe.

Compiles now.
.gitignore brought up to task.