done mapping
Merge branch 'master' of https://github.com/software-architecture-2014/ass3_ass4

Conflicts:
	main.py
ordnung muss sein