fix everything like a boss
Merge branch 'master' of https://github.com/col6y/codeday-fall-2014