Merge

And show windows operations because I'm on a fucking tablet
Merge remote-tracking branch 'origin/master'

Conflicts:
	Deshou STEAM/resource/webkit.css