Merge remote-tracking branch 'origin/master'

Conflicts:
	project 6/Project 6/Debug/Project6.tlog/Project6.write.1u.tlog
	project 6/Project6.sdf
	project 6/Project6.v12.suo