Updated .gitignore.
Can't remember
Merged everything correctly that was messed up.