Merge pull request #7 from rhololkeolke/master

Fixing files that shouldn't be checked in.