new about
Merge branch 'gh-pages' of https://github.com/commercetools/apidays-berlin2014 into gh-pages

Conflicts:
	img/.DS_Store