test commit ssh
ssh test
resolved conflict
Merge branch 'master' of github.com:AlexBondor/Koding-Hackathon-App
Merge branch 'master' of github.com:AlexBondor/Koding-Hackathon-App
Fresh start
Fresh start