fixing things. testing things boop bop
Merge branch 'master' of https://github.com/Jamonek/koding_hackathon2014