routes change
changed route
Merge branch 'master' into c3-toka-sprint0
put my branch again after it got removed *toka*
small mistake when I copied
final correction
corrected the documentation
Merge pull request #128 from yousraHazem/c3-toka-sprint0

C3 toka sprint0
merge
Merge pull request #129 from yousraHazem/c1_sama_sprint_0

merge
changes
readd
Merge pull request #130 from yousraHazem/C3_yasmin_is_project_creator

readd
commented the repeated delete, destrou. list
routes conflict
yes
I added my missing def in posts and comments controllers
Merge pull request #131 from yousraHazem/c2_Riham_create_post

C2 riham create post
sarah's edit
Merge pull request #132 from yousraHazem/C3_yasmin_is_project_creator

sarah's edit