Merge branch 'master' of github.com:mrfexx/ba

Conflicts:
	Beispielbild/Thumbs.db

Signed-off-by: Sebastian <sg@ninjaconcept.com>