fixed really dumb error that was preventing post
Merge remote-tracking branch 'origin/master'