Blubb
Merge branch 'master' of https://github.com/Mofeywalker/uebungenss2013

Conflicts:
	ueb14/AwesomeTools.h