Committing from IntelliJ and messing with my files. Again.
Models N' Stuff
Merge remote-tracking branch 'origin/master'