Refactored more red
Merge branch 'master' of https://github.com/orby/hackaton