now with actual content
Merge branch 'final_presentation' of https://github.com/voxelinc/voxellancer into final_presentation