modify Gemfile.lock
fix conflict Gemfile.lock
Added some page make up && work with tags, partial work with images