first commit :x
Merge branch 'master' of https://github.com/taranir/fishbowl