Jekyll Git bleh
Merge branch 'gh-pages' of https://github.com/dannyhope/uxbrighton into gh-pages

Conflicts:
	_site/2014/index.html
	_site/index.html