non-descript changes to allow for sync

I don't remember what these changes are, but I hope to find out.
Merge remote-tracking branch 'origin/master'

Conflicts:
	CSS/gracelandv2r1.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	CSS/gracelandv2r1.css
	CSS/gracelandv2r1_UM.css