almost done
Merge branch 'master' of github.com:AlexBondor/Koding-Hackathon-App