testing
various shit fixed
Merge branch 'master' of https://github.com/ranocohen/redcoloralert.git