update gem.lock file
added jQuery masonry
merging branches
resolve conflicts