Fixed error that somehow occurred during a branch merge.

Also added a .gitignore for image files that are not output, and project files.