Integrated origin/ready/adam
Integrated origin/ready/adam
Integrated origin/ready/adam
Merge branch 'master' of github.com:CoDeCPH/CoDeCPH.github.io into adam

Conflicts:
	blog/_posts/2014-09-18-Removing-waste-from-pipeline.md