Jar is being a huge pain in my butt...
Merge remote-tracking branch 'origin/master'