fixin flockin stuff
Merge branch 'master' of github.com:dmanning23/FlockBuddy