Fixed critical error that cropped up when merging.
Added .gitignore.
Merge pull request #2 from jis2507/master

Fixed error that somehow occurred during a branch merge.