Ty Design changes

blach
Ty Changes
Merge branch 'master' of https://github.com/sfaletti/parklife

Conflicts:
	website/count.xml