Merge with remote branch with collision detection and implemented a DemoBot thing.
some changes