Don't remember
Merge conflicts
Changed stuff.
Updated gitignore to ignore binary files, fixed a conflict from last merge.