Incorporating Utter's code.
Updated .gitignore. Annoying!
complete merge