Come on github sync my pc
Damn broadband was not online, oh great commit by the way
Merge remote-tracking branch 'origin/master'

Conflicts:
	L42/L42.sln
	L42/L42/L42.vcxproj
	L42/L42/L42.vcxproj.filters