Merge pull request #19 from mfa/master

3.10. Protokoll / 17.10. Agenda v1
Update 2014-October-17.rst
Merge pull request #20 from mfa/patch-2

Update 2014-October-17.rst
Merge branch 'master' of https://github.com/shackspace/stupig-protokolle

Conflicts:
	2014-October-17.rst