Trying to sync

trying to sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	DeCoder/DeCoder.sdf
	DeCoder/DeCoder.v12.suo