There were stuff I changed in my local computer, so I'm committing.
Merged, resolved conflicts.