Don't know what's going on with all these extra commits...
Merge remote-tracking branch 'origin/master'
I think the problem is I'm not committing before I pull any everything