Link to Erlang presentation slides added
Merge branch 'master' of git://github.com/momo13/ggmBerlin into momo13-master

Conflicts:
	public/index.html