refactored
Merge branch 'master' of https://github.com/letskickin/our-boxen