Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit dfc098b462a47fc49d72f770b5efd1084c4bee69, reversing
changes made to 12a156c2cbb92da273c7f51fac60e50c82faadd0.

Conflicts:
	css/style.css