starting comments
refactoring
Merge branch 'master' of https://github.com/bighazycrab/hackathon_01