fixed conflicts head merge to master
Merge pull request #326 from ndomar/fixing_samy_head_gemfile

fixed conflicts head merge to master
Merge branch 'master' of https://github.com/ndomar/megasoft-13 into Package_Explorer_With_Show_and_Save_and_Photos
I guess I am done just the UML
Almost Done
Missing Documenation