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

Conflicts:
	ueb12/Artikel.exe
	ueb12/Artikel.o