Pauls 5
Merge branch 'master' of gh:opatut/ES-2014

Conflicts:
	blatt05_1/blatt05_1.ino