Trying to add styling...trying
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/gosu/view/Layout.gst
	src/main/gosu/view/Root.gst