Fixed merge conflicts
Logo; fixed masonry
user index page