flockrs beginnings
Merge branch 'master' of https://github.com/xmik3yvx/flockr