Circumstance circle
Circum 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/divingteam/divingball/data/shape/Beam.java
	app/src/main/java/divingteam/divingball/engine/Render.java
Merge branch 'master' of https://github.com/Crikka/DivingBall

Conflicts:
	app/src/main/java/divingteam/divingball/engine/Render.java