Updated with edge animations
Merge branch 'master' of https://github.com/j105rob/ctf_scram_scoreboard

Conflicts:
	js/3DJS.js
Revert "Merge branch 'master' of https://github.com/j105rob/ctf_scram_scoreboard"

This reverts commit 66b3a06f6066c34b964af5644fa5cf267a186ffd, reversing
changes made to 2f862825ee8e9960732897582d870e9318de0a51.
Updated with edge animations