Used Weston's merge.

Everything is working now.
changed .gitignore