added the masonry library
fixed merge conflict