Preparing to merge
Preparing to merge again
Merge remote-tracking branch 'origin/master'

Conflicts:
	MQP/MQP.sdf
	MQP/MQP.v12.suo
trying to merge
Merged, fixes some bugs with speed boost