Merge branch 'master' of https://github.com/ndomar/megasoft-14 into salmaa
Merge branch 'master' of https://github.com/ndomar/megasoft-14 into salmaa
Merge pull request #95 from ndomar/Blog_C5

Blog c5
Adding files updated by Bassem
Merge pull request #96 from ndomar/componentTwo

Adding files updated by Bassem
New configurations for Component 5
Merge pull request #97 from ndomar/componentTwo

New configurations for Component 5
Template for the models
add new project
Merge pull request #99 from ndomar/salma

add new project
untracking .vagrant
Merge branch 'master' of https://github.com/ndomar/megasoft-14 into salmaa
project template
Merge pull request #100 from ndomar/C3-MegaTODO-farghal

C3 mega todo farghal
Merge branch 'master' of https://github.com/ndomar/megasoft-14 into guestBook
add guestBook
Merge pull request #101 from ndomar/guestBook

Guest book
done
Merge pull request #102 from ndomar/guestBook

done
test