parallax, pulling updates
Merge branch 'master' of https://github.com/Karima22/weShare
Merge branch 'master' of https://github.com/Karima22/weShare
working on new layout