Merge pull request #66 from ndomar/4_Samy_Rails-task_S9

4 samy rails task s9
merged all work till nw
Merge branch 'C4_Samy_Rails-task_S11' of http://github.org/ndomar/megasoft-13 into C4_Samy_Rails-task_S11
CSS