Merge branch 'master' into gh-pages
Merged master to gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	_site/3authors-2books-1event/index.html
	_site/a-brief-guide-to-service-design/index.html
	_site/a-journey-from-ethnography-to-design/index.html
	_site/archive.html
	_site/curry-night/index.html
	_site/design-games/index.html
	_site/double-bill-designing-the-ux-curve/index.html
	_site/finding-your-way-in-wayfinding/index.html
	_site/hands-on-with-eyetracking-and-biometrics/index.html
	_site/index.html
	_site/information-visualisation-mini-event/index.html
	_site/listening/index.html
	_site/local-and-remote-usability-testing/index.html
	_site/measuring-online-engagement/index.html
	_site/mental-models-service-design/index.html
	_site/mobile-design-triple-bill/index.html
	_site/mobile-user-testing/index.html
	_site/objects-and-play/index.html
	_site/oktoberfest/index.html
	_site/practical-insights-out-of-the-box-experience/index.html
	_site/practical-tips-and-templates/index.html
	_site/summer-special/index.html
	_site/supergoogleanalyticsexpialidocious/index.html
	_site/ux-brighton-2010/index.html
	_site/ux-brighton-2011/index.html
	_site/ux-brighton-goes-for-a-spin/index.html
	_site/ux-quiz/index.html
	_site/uxcb13redux/index.html
Merge branch 'master' into gh-pages

Conflicts:
	_site/codekit-config.json
Updates to Readme
Merge branch 'gh-pages'