New Post: Marathon Traning
Changes to the layout files

and also rework of the archive page
Added everything

Conflicts:
	.DS_Store
	.gitignore
	_config.yml
	_includes/_header.html
	_includes/_page_header.html
	_includes/post.html
	_layouts/default.html
	_layouts/home.html
	_layouts/post.html
	_site/Things-to-do-with-Jeykll/index.html
	_site/a-common-visual-language/index.html
	_site/a-content-out-approch/index.html
	_site/a-gap/index.html
	_site/a-list-apart-articles-becoming-better-communicators/index.html
	_site/a-post-a-day-in-may/index.html
	_site/a-test-post/index.html
	_site/about/index.html

_site/apples-lead-comes-under-threat-marketing-news-marketing-magazine/i
ndex.html
	_site/are-bookmarks-really-worth-it/index.html
	_site/artefact-cards/index.html
	_site/assets/css/style.css
	_site/blueprints-codrops/index.html
	_site/brightons-cool-for-web-types/index.html
	_site/captcha-on-bbc-radio-4-in-touch-02102012/index.html
	_site/convincing-non-belivers/index.html
	_site/define-responsive/index.html
	_site/designers-will-code-design-startups-medium/index.html
	_site/designing-for-people-but-which-people/index.html
	_site/display-none-and-sharing-what-you-know-laura-kalbag/index.html

_site/divshot-an-awesome-way-to-design-and-build-bootstrap-pages-design-
shack/index.html
	_site/easel-a-wysiwyg-bootstrap-page-builder-design-shack/index.html
	_site/experiments/index.html
	_site/free-for-30-days/index.html
	_site/guiding-principles/index.html
	_site/how-not-to-handle-opt-outs-in-email-today/index.html
	_site/ifttt-recipe-2266357/index.html
	_site/index.html
	_site/ios-simulator/index.html
	_site/it-depends/index.html
	_site/journal-of-information-architecture/index.html
	_site/magazine-printing-make-a-magazine-blurb-uk/index.html
	_site/offscreen-magazine-a-print-magazine-about-pixel-people/index.html
	_site/pirate-metrics-five-key-metrics-for-business/index.html
	_site/post-archive/index.html
	_site/product-roadmap-planning-in-net-mag/index.html
	_site/protoshare/index.html
	_site/prototyping-frameworks/index.html
	_site/questions-about-moving-to-jekyll/index.html
	_site/random-user-generator/index.html

_site/rar-top-100-agencies-revealed-wrg-claims-top-spot-for-2012-the-dru
m/index.html
	_site/resolutions/index.html
	_site/responsive-screenshots-with-casper-nettuts/index.html
	_site/restarting-the-local-dns-server/index.html
	_site/setting-up-a-site-using-drupal-as-the-cms/index.html
	_site/setting-up-a-svn-repository-and-working-copy/index.html

_site/smaply-smart-service-mapping-digital-customer-experience-mapping/i
ndex.html
	_site/state-of-the-browser-london-web-standards/index.html
	_site/state-of-the-internet-akamai/index.html
	_site/still-using-word/index.html
	_site/streatham-festival/index.html
	_site/surviving-design-projects/index.html
	_site/talking-about-prototyping/index.html
	_site/the-best-project-process-ever/index.html
	_site/the-ixda-speaker-network-is-live-ixda/index.html
	_site/the-jargon-circle/index.html
	_site/the-peak-end-rule/index.html
	_site/the-problem-with-writing/index.html
	_site/this-ux-magic-is-remarkable/index.html
	_site/unheap-a-tidy-repository-of-jquery-plugins/index.html
	_site/ux-brighton-mobile-usability-testing/index.html
	_site/welcome-to-jekyll/index.html
	_site/what-got-you-started/index.html
	_site/when-rules-go-wrong/index.html

_site/which-remote-research-tool-should-i-use-flickr-photo-sharing/index
.html
	_site/your-place-in-the-packing-order/index.html
	assets/css/style.css
	compass/config.rb
	index.html
	mixture.json