Updating things.
Merge branch 'master' of github.com:KirinDave/ResonantRise into dev
Oh macs.
Merge branch 'dev' of github.com:KirinDave/ResonantRise into dev
As close as we can get.