sonstwas
merge
merge
Merge branch 'master' of https://github.com/helme/bachelor2014

Conflicts:
	main.py
Merge branch 'master' of https://github.com/helme/bachelor2014
gibbs korrigiert
dunno
merge
merge
neu