combo

Signed-off-by: Philipp Liepert <philipp@phillsoft.de>
Merge branch 'master' of https://github.com/real-time-rendering/webgl-a1