updated files
Merge branch 'october-hackathon' of https://github.com/hhroc/yellr into october-hackathon