NavBar with logo and sliding fixed
 hi
Merge branch 'dev' of https://github.com/YasminRazavi/photo_sharing_app into dev
fixed cancan issue
Merge branch 'dev' into cancan
Checking all up to date
Cancan now working, but can't test everything (e.g. deletions) yet.
Checking all up to date
all the good stuff with search done
Merge branch 'dev' of https://github.com/YasminRazavi/photo_sharing_app into dev
Merge branch 'dev' into search
commitBeforeMergingWithYasmin
conflict resloved
Trying to make sure the style is updated
Merge branch 'dev' into style
Getting up to date
some minor changes
resolved conflicts
Collections update
Checking up to date
working on liking shit
Merge branch 'dev' into likeable