mainhall with froggy
Merge branch 'master' of https://github.com/noltze/c-base_game_dev

Conflicts:
	client_001/.DS_Store
	client_001/050513_mitSchleuse.blend1
	client_001/050513_mitSchleuse.blend2