Updated stylesheet links in head.html.
Merge branch 'master' of github.com:Protolich/thomstradling.co.uk
Merge branch 'master' of github.com:Protolich/thomstradling.co.uk

Conflicts:
	core/cache/context_settings/mgr/context.cache.php
	core/cache/context_settings/web/context.cache.php
	core/cache/logs/error.log
	core/cache/mgr/smarty/default/0392e2c870a72789986db9ec7f8bc2bcbbdb469c.file.welcome.tpl.php
	core/cache/mgr/smarty/default/0de2cdf8c90700e5623194a391df2317ee3efe7c.file.footer.tpl.php
	core/cache/mgr/smarty/default/53ecc92bde3d3bfdcf490064d8a91a4bf7616936.file.hidden.tpl.php
	core/cache/mgr/smarty/default/7c83a6d8ed656ee5c9ba48a038c2bae428b1b237.file.create.tpl.php
	core/cache/mgr/smarty/default/852e7e15beb73e28d8bad905520c23faff240e60.file.header.tpl.php
	core/cache/mgr/smarty/default/97d3b863a18cd7fc5a93652c28af3e8f374fe1b6.file.tvs.tpl.php
	core/cache/mgr/smarty/default/cf279ae56ccade916af906d8f666b5ae7f8e1554.file.update.tpl.php
	core/cache/registry/state/ys/user-1/modx-resource-tree.msg.php
	core/cache/registry/state/ys/user-1/modx-tree-element.msg.php
	core/cache/resource/web/resources/1.cache.php
	core/cache/resource/web/resources/2.cache.php
	core/cache/resource/web/resources/2/1/d41d8cd98f00b204e9800998ecf8427e.cache.php
	core/cache/rss/db08533834b22a850d2a76c183fa8c9e
Merge branch 'master' of github.com:Protolich/thomstradling.co.uk