Amends
Merge branch 'master' of https://github.com/chrishanes/101_London

Conflicts:
	wp-content/themes/twentytwelve/style.css