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
Index
caps
Squashed commit of the following:

commit 4dc17aad5dee7e5a1088121031bf8a340dfb7adb
Author: Lars Kruse <lak@praqma.net>
Date:   Mon Nov 17 19:54:03 2014 +0100

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

Conflicts:
	index.md