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

Conflicts:
	program/index.md