changes on server
Merge branch 'master' of github.com:mahsa-poorjafari/prepare_project
Merge branch 'master' of github.com:mahsa-poorjafari/prepare_project
Merge branch 'master' of github.com:mahsa-poorjafari/prepare_project
Merge branch 'master' of github.com:mahsa-poorjafari/prepare_project
sent modify from server: delet test, modify _slider, add picture views,
Merge branch 'master' of github.com:mahsa-poorjafari/prepare_project