fg
Merge remote-tracking branch 'origin/master'

Conflicts:
	RateMyDebate/RateMyDebate.v12.suo