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

Conflicts:
	blog/_posts/2014-11-07-Post Conference Blogpost.md
	images/giveaway.jpg
	images/welcome.jpg