tmp mover
simple move
Merge branch 'master' of https://github.com/Galaxy2/Projektarbeit
Merge branch 'master' of https://github.com/Galaxy2/Projektarbeit

Conflicts:
	code/src/main.cpp