Merge remote-tracking branch 'roach/master' into asciiart

Conflicts:
	css/style.css
Merge branch 'asciiart' into asciiart+font

Conflicts:
	css/style.css