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

Conflicts:
	MQP/MQP.sdf
	MQP/MQP.v12.suo
Merge remote-tracking branch 'origin/master'

Conflicts:
	MQP/MQP.sdf
	MQP/MQP.v12.suo
preparing to merge
Level 4