minor changes in main.cpp for testing purposes
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
added files for milestone 3, rail-editor part