Removed file that shouldn't be tracked
Okay, everything's ready. =D
Merge remote-tracking branch 'origin'