Come on github
Merge remote-tracking branch 'origin/master'

Conflicts:
	L83/L83.sln
	L83/L83/L83.vcxproj
	L83/L83/L83.vcxproj.filters