Merge pull request #22 from soundsplosion/tg

Replaced rhombus.js with the instantiable version, and updated the new t...
Merge branch 'develop', remote-tracking branch 'origin' into develop
Merge branch 'develop', remote-tracking branch 'origin' into tg