render asteroid field (step 1)
fixing cmake list so that recent changes (level.h, level.cpp) are recognized
avoiding asteroid overlappings and storing asteroids as octree
resolving conflicts
Merge branch 'master' into addlibs

Conflicts:
	CMakeLists.txt
	src/main.cpp