added bin directory
fixed spec file for blocked?
fixed
fixed all the bugs
resolved conflicts
Merge branch 'feature'