tinymce
news all
news all3
	modified:   .gitignore
	deleted:    app/assets/javascripts/admin.js.coffee
	deleted:    app/assets/javascripts/ads.js.coffee
	deleted:    app/assets/javascripts/announcements.js.coffee
	deleted:    app/assets/javascripts/cartoons.js.coffee
	deleted:    app/assets/javascripts/comments.js.coffee
	deleted:    app/assets/javascripts/films.js.coffee
	deleted:    app/assets/javascripts/kinofilm.js.coffee
	deleted:    app/assets/javascripts/news.js.coffee
	deleted:    app/assets/javascripts/profil.js.coffee
	deleted:    app/assets/javascripts/search.js.coffee
	deleted:    app/assets/javascripts/setting.js.coffee
	deleted:    app/assets/javascripts/slides.js.coffee
	deleted:    app/assets/javascripts/user.js
	deleted:    app/assets/javascripts/users/omniauth_callbacks.js.coffee
	deleted:    app/assets/stylesheets/admin.css.scss
	deleted:    app/assets/stylesheets/ads.css.scss
	deleted:    app/assets/stylesheets/announcements.css.scss
	deleted:    app/assets/stylesheets/cartoons.css.scss
	deleted:    app/assets/stylesheets/kinofilm.css.scss
	deleted:    app/assets/stylesheets/news.css.scss
	deleted:    app/assets/stylesheets/profil.css.scss
	deleted:    app/assets/stylesheets/search.css.scss
	deleted:    app/assets/stylesheets/setting.css.scss
	deleted:    app/assets/stylesheets/slides.css.scss
	deleted:    app/assets/stylesheets/users/omniauth_callbacks.css.scss
	deleted:    app/controllers/new_controller.rb
	deleted:    app/helpers/admin_helper.rb
	deleted:    app/helpers/ads_helper.rb
	deleted:    app/helpers/announcements_helper.rb
	deleted:    app/helpers/cartoons_helper.rb
	deleted:    app/helpers/comments_helper.rb
	deleted:    app/helpers/kinofilm_helper.rb
	deleted:    app/helpers/news_helper.rb
	deleted:    app/helpers/profil_helper.rb
	deleted:    app/helpers/search_helper.rb
	deleted:    app/helpers/setting_helper.rb
	deleted:    app/helpers/slides_helper.rb
	deleted:    app/helpers/users/omniauth_callbacks_helper.rb
	deleted:    public/facebook_icon.png
	deleted:    public/faicbook.jpeg
	deleted:    public/uploads/ad/image/1/576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/ad/image/1/banner16.gif
	deleted:    public/uploads/ad/image/1/big_image_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/ad/image/1/big_image_banner16.gif
	deleted:    public/uploads/ad/image/1/big_image_slide1.jpg
	deleted:    public/uploads/ad/image/1/slide1.jpg
	deleted:    public/uploads/ad/image/1/slide_image_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/ad/image/1/slide_image_banner16.gif
	deleted:    public/uploads/ad/image/1/slide_image_slide1.jpg
	deleted:    public/uploads/ad/image/1/smal_avatar_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/ad/image/1/smal_avatar_banner16.gif
	deleted:    public/uploads/ad/image/1/smal_avatar_slide1.jpg
	deleted:    public/uploads/ad/image/1/smal_image_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/ad/image/1/smal_image_banner16.gif
	deleted:    public/uploads/ad/image/1/smal_image_slide1.jpg
	deleted:    public/uploads/ad/image/2/576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/ad/image/2/793357157.jpg
	deleted:    public/uploads/ad/image/2/big_image_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/ad/image/2/big_image_793357157.jpg
	deleted:    public/uploads/ad/image/2/slide_image_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/ad/image/2/slide_image_793357157.jpg
	deleted:    public/uploads/ad/image/2/smal_avatar_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/ad/image/2/smal_avatar_793357157.jpg
	deleted:    public/uploads/ad/image/2/smal_image_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/ad/image/2/smal_image_793357157.jpg
	deleted:    public/uploads/ad/image/3/777.jpg
	deleted:    public/uploads/ad/image/3/793357157.jpg
	deleted:    public/uploads/ad/image/3/big_image_777.jpg
	deleted:    public/uploads/ad/image/3/big_image_793357157.jpg
	deleted:    public/uploads/ad/image/3/slide_image_777.jpg
	deleted:    public/uploads/ad/image/3/slide_image_793357157.jpg
	deleted:    public/uploads/ad/image/3/smal_avatar_777.jpg
	deleted:    public/uploads/ad/image/3/smal_avatar_793357157.jpg
	deleted:    public/uploads/ad/image/3/smal_image_777.jpg
	deleted:    public/uploads/ad/image/3/smal_image_793357157.jpg
	deleted:    public/uploads/ad/image/4/793357157.jpg
	deleted:    public/uploads/ad/image/4/big_image_793357157.jpg
	deleted:    public/uploads/ad/image/4/slide_image_793357157.jpg
	deleted:    public/uploads/ad/image/4/smal_avatar_793357157.jpg
	deleted:    public/uploads/ad/image/4/smal_image_793357157.jpg
	deleted:    public/uploads/ad/image/5/468_60.gif
	deleted:    public/uploads/ad/image/5/big_image_468_60.gif
	deleted:    public/uploads/ad/image/5/slide_image_468_60.gif
	deleted:    public/uploads/ad/image/5/smal_avatar_468_60.gif
	deleted:    public/uploads/ad/image/5/smal_image_468_60.gif
	deleted:    public/uploads/announcement/image/1/a_38e0ce25.jpg
	deleted:    public/uploads/announcement/image/1/big_image_a_38e0ce25.jpg
	deleted:    public/uploads/announcement/image/1/slide_image_a_38e0ce25.jpg
	deleted:    public/uploads/announcement/image/1/smal_avatar_a_38e0ce25.jpg
	deleted:    public/uploads/announcement/image/1/smal_image_a_38e0ce25.jpg
	deleted:    public/uploads/film/image/1/47e29f9fe96a1771642fb05ac8a8fd00_XL.jpg
	deleted:    public/uploads/film/image/1/big_image_47e29f9fe96a1771642fb05ac8a8fd00_XL.jpg
	deleted:    public/uploads/film/image/1/slide_image_47e29f9fe96a1771642fb05ac8a8fd00_XL.jpg
	deleted:    public/uploads/film/image/1/smal_avatar_47e29f9fe96a1771642fb05ac8a8fd00_XL.jpg
	deleted:    public/uploads/film/image/1/smal_image_47e29f9fe96a1771642fb05ac8a8fd00_XL.jpg
	deleted:    public/uploads/film/image/10/576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/film/image/13/576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/film/image/2/576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/film/image/2/a_38e0ce25.jpg
	deleted:    public/uploads/film/image/2/big_image_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/film/image/2/big_image_a_38e0ce25.jpg
	deleted:    public/uploads/film/image/2/big_image_fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/film/image/2/fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/film/image/2/slide_image_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/film/image/2/slide_image_a_38e0ce25.jpg
	deleted:    public/uploads/film/image/2/smal_avatar_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/film/image/2/smal_avatar_a_38e0ce25.jpg
	deleted:    public/uploads/film/image/2/smal_image_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/film/image/2/smal_image_a_38e0ce25.jpg
	deleted:    public/uploads/film/image/2/smal_image_fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/film/image/3/576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/film/image/3/793357157.jpg
	deleted:    public/uploads/film/image/3/big_image_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/film/image/3/big_image_793357157.jpg
	deleted:    public/uploads/film/image/3/big_image_fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/film/image/3/fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/film/image/3/slide_image_793357157.jpg
	deleted:    public/uploads/film/image/3/slide_image_fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/film/image/3/smal_avatar_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/film/image/3/smal_avatar_793357157.jpg
	deleted:    public/uploads/film/image/3/smal_avatar_fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/film/image/3/smal_image_576492c356d8e0278dfa7b752bad5bc8_S.jpg
	deleted:    public/uploads/film/image/3/smal_image_793357157.jpg
	deleted:    public/uploads/film/image/3/smal_image_fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/film/image/4/793357157.jpg
	deleted:    public/uploads/film/image/4/big_image_793357157.jpg
	deleted:    public/uploads/film/image/4/big_image_slide1.jpg
	deleted:    public/uploads/film/image/4/slide1.jpg
	deleted:    public/uploads/film/image/4/slide_image_793357157.jpg
	deleted:    public/uploads/film/image/4/slide_image_slide1.jpg
	deleted:    public/uploads/film/image/4/smal_avatar_793357157.jpg
	deleted:    public/uploads/film/image/4/smal_avatar_slide1.jpg
	deleted:    public/uploads/film/image/4/smal_image_793357157.jpg
	deleted:    public/uploads/film/image/4/smal_image_slide1.jpg
	deleted:    public/uploads/film/image/5/793357157.jpg
	deleted:    public/uploads/film/image/5/big_image_793357157.jpg
	deleted:    public/uploads/film/image/5/big_image_comment.jpg
	deleted:    public/uploads/film/image/5/big_image_fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/film/image/5/comment.jpg
	deleted:    public/uploads/film/image/5/fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/film/image/5/slide_image_793357157.jpg
	deleted:    public/uploads/film/image/5/slide_image_fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/film/image/5/smal_avatar_793357157.jpg
	deleted:    public/uploads/film/image/5/smal_avatar_comment.jpg
	deleted:    public/uploads/film/image/5/smal_avatar_fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/film/image/5/smal_image_793357157.jpg
	deleted:    public/uploads/film/image/5/smal_image_comment.jpg
	deleted:    public/uploads/film/image/5/smal_image_fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/film/image/6/793357157.jpg
	deleted:    public/uploads/film/image/6/a_38e0ce25.jpg
	deleted:    public/uploads/film/image/6/big_image_497233.jpg
	deleted:    public/uploads/film/image/6/big_image_793357157.jpg
	deleted:    public/uploads/film/image/6/big_image_big_image_497233.jpg
	deleted:    public/uploads/film/image/6/slide_image_793357157.jpg
	deleted:    public/uploads/film/image/6/slide_image_big_image_497233.jpg
	deleted:    public/uploads/film/image/6/smal_avatar_793357157.jpg
	deleted:    public/uploads/film/image/6/smal_avatar_big_image_497233.jpg
	deleted:    public/uploads/film/image/6/smal_image_793357157.jpg
	deleted:    public/uploads/film/image/6/smal_image_big_image_497233.jpg
	deleted:    public/uploads/film/image/7/793357157.jpg
	deleted:    public/uploads/film/image/7/big_image_497233.jpg
	deleted:    public/uploads/film/image/7/big_image_793357157.jpg
	deleted:    public/uploads/film/image/7/big_image_big_image_497233.jpg
	deleted:    public/uploads/film/image/7/slide_image_793357157.jpg
	deleted:    public/uploads/film/image/7/slide_image_big_image_497233.jpg
	deleted:    public/uploads/film/image/7/smal_avatar_793357157.jpg
	deleted:    public/uploads/film/image/7/smal_avatar_big_image_497233.jpg
	deleted:    public/uploads/film/image/7/smal_image_793357157.jpg
	deleted:    public/uploads/film/image/7/smal_image_big_image_497233.jpg
	deleted:    public/uploads/film/image/8/47e29f9fe96a1771642fb05ac8a8fd00_XL.jpg
	deleted:    public/uploads/film/image/8/big_image_47e29f9fe96a1771642fb05ac8a8fd00_XL.jpg
	deleted:    public/uploads/film/image/8/slide_image_47e29f9fe96a1771642fb05ac8a8fd00_XL.jpg
	deleted:    public/uploads/film/image/8/smal_avatar_47e29f9fe96a1771642fb05ac8a8fd00_XL.jpg
	deleted:    public/uploads/film/image/8/smal_image_47e29f9fe96a1771642fb05ac8a8fd00_XL.jpg
	deleted:    public/uploads/news/image/1/_______.jpeg
	deleted:    public/uploads/news/image/1/big_image_497233.jpg
	deleted:    public/uploads/news/image/1/big_image________.jpeg
	deleted:    public/uploads/news/image/1/big_image_big_image_497233.jpg
	deleted:    public/uploads/news/image/1/slide_image________.jpeg
	deleted:    public/uploads/news/image/1/slide_image_big_image_497233.jpg
	deleted:    public/uploads/news/image/1/smal_avatar________.jpeg
	deleted:    public/uploads/news/image/1/smal_avatar_big_image_497233.jpg
	deleted:    public/uploads/news/image/1/smal_image________.jpeg
	deleted:    public/uploads/news/image/1/smal_image_big_image_497233.jpg
	deleted:    public/uploads/news/image/4/793357157.jpg
	deleted:    public/uploads/news/image/4/big_image_793357157.jpg
	deleted:    public/uploads/news/image/4/slide_image_793357157.jpg
	deleted:    public/uploads/news/image/4/smal_avatar_793357157.jpg
	deleted:    public/uploads/news/image/4/smal_image_793357157.jpg
	deleted:    public/uploads/news/image/6/1362593697-clip-61kb.jpg
	deleted:    public/uploads/news/image/6/big_image_1362593697-clip-61kb.jpg
	deleted:    public/uploads/news/image/6/slide_image_1362593697-clip-61kb.jpg
	deleted:    public/uploads/news/image/6/smal_avatar_1362593697-clip-61kb.jpg
	deleted:    public/uploads/news/image/6/smal_image_1362593697-clip-61kb.jpg
	deleted:    public/uploads/slide/image/1/big_image_slide1.jpg
	deleted:    public/uploads/slide/image/1/big_image_slide3.jpg
	deleted:    public/uploads/slide/image/1/big_image_slide_image_slide1.jpg
	deleted:    public/uploads/slide/image/1/slide1.jpg
	deleted:    public/uploads/slide/image/1/slide3.jpg
	deleted:    public/uploads/slide/image/1/slide_image_slide1.jpg
	deleted:    public/uploads/slide/image/1/slide_image_slide3.jpg
	deleted:    public/uploads/slide/image/1/slide_image_slide_image_slide1.jpg
	deleted:    public/uploads/slide/image/1/smal_avatar_slide1.jpg
	deleted:    public/uploads/slide/image/1/smal_avatar_slide3.jpg
	deleted:    public/uploads/slide/image/1/smal_avatar_slide_image_slide1.jpg
	deleted:    public/uploads/slide/image/1/smal_image_slide1.jpg
	deleted:    public/uploads/slide/image/1/smal_image_slide3.jpg
	deleted:    public/uploads/slide/image/1/smal_image_slide_image_slide1.jpg
	deleted:    public/uploads/slide/image/2/big_image_slide1.jpg
	deleted:    public/uploads/slide/image/2/big_image_slide3.jpg
	deleted:    public/uploads/slide/image/2/slide1.jpg
	deleted:    public/uploads/slide/image/2/slide3.jpg
	deleted:    public/uploads/slide/image/2/slide_image_slide1.jpg
	deleted:    public/uploads/slide/image/2/slide_image_slide3.jpg
	deleted:    public/uploads/slide/image/2/smal_avatar_slide1.jpg
	deleted:    public/uploads/slide/image/2/smal_avatar_slide3.jpg
	deleted:    public/uploads/slide/image/2/smal_image_slide1.jpg
	deleted:    public/uploads/slide/image/2/smal_image_slide3.jpg
	deleted:    public/uploads/slide/image/3/big_image_slide_image_____________.jpg
	deleted:    public/uploads/slide/image/3/big_image_slide_image_obitel_zla.jpg
	deleted:    public/uploads/slide/image/3/slide_image_____________.jpg
	deleted:    public/uploads/slide/image/3/slide_image_obitel_zla.jpg
	deleted:    public/uploads/slide/image/3/slide_image_slide_image_____________.jpg
	deleted:    public/uploads/slide/image/3/slide_image_slide_image_obitel_zla.jpg
	deleted:    public/uploads/slide/image/3/smal_avatar_slide_image_____________.jpg
	deleted:    public/uploads/slide/image/3/smal_avatar_slide_image_obitel_zla.jpg
	deleted:    public/uploads/slide/image/3/smal_image_slide_image_____________.jpg
	deleted:    public/uploads/slide/image/3/smal_image_slide_image_obitel_zla.jpg
	deleted:    public/uploads/slide/image/6/big_image_slide3.jpg
	deleted:    public/uploads/slide/image/6/slide3.jpg
	deleted:    public/uploads/slide/image/6/slide_image_slide3.jpg
	deleted:    public/uploads/slide/image/6/smal_avatar_slide3.jpg
	deleted:    public/uploads/slide/image/6/smal_image_slide3.jpg
	deleted:    public/uploads/user/avatar/1/a_38e0ce25.jpg
	deleted:    public/uploads/user/avatar/1/big_image_a_38e0ce25.jpg
	deleted:    public/uploads/user/avatar/1/slide_image_a_38e0ce25.jpg
	deleted:    public/uploads/user/avatar/1/smal_avatar_a_38e0ce25.jpg
	deleted:    public/uploads/user/avatar/1/smal_image_a_38e0ce25.jpg
	deleted:    public/uploads/user/avatar/12/a_38e0ce25.jpg
	deleted:    public/uploads/user/avatar/12/big_image_a_38e0ce25.jpg
	deleted:    public/uploads/user/avatar/12/slide_image_a_38e0ce25.jpg
	deleted:    public/uploads/user/avatar/12/smal_avatar_a_38e0ce25.jpg
	deleted:    public/uploads/user/avatar/12/smal_image_a_38e0ce25.jpg
	deleted:    public/uploads/user/avatar/14/big_image_fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/user/avatar/14/fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/user/avatar/14/smal_avatar_fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/user/avatar/14/smal_image_fe392f78a62c6fc460cf8c2a182b395f_XL.jpg
	deleted:    public/uploads/user/avatar/2/47e29f9fe96a1771642fb05ac8a8fd00_XL.jpg
	deleted:    public/uploads/user/avatar/2/big_image_47e29f9fe96a1771642fb05ac8a8fd00_XL.jpg
	deleted:    public/uploads/user/avatar/2/smal_avatar_47e29f9fe96a1771642fb05ac8a8fd00_XL.jpg
	deleted:    public/uploads/user/avatar/2/smal_image_47e29f9fe96a1771642fb05ac8a8fd00_XL.jpg
	deleted:    public/uploads/user/avatar/6/793357157.jpg
	deleted:    public/uploads/user/avatar/6/big_image_793357157.jpg
	deleted:    public/uploads/user/avatar/6/slide_image_793357157.jpg
	deleted:    public/uploads/user/avatar/6/smal_avatar_793357157.jpg
	deleted:    public/uploads/user/avatar/6/smal_image_793357157.jpg
	deleted:    spec/controllers/admin_controller_spec.rb
	deleted:    spec/controllers/ads_controller_spec.rb
	deleted:    spec/controllers/announcements_controller_spec.rb
	deleted:    spec/controllers/cartoons_controller_spec.rb
	deleted:    spec/controllers/comments_controller_spec.rb
	deleted:    spec/controllers/kinofilm_controller_spec.rb
	deleted:    spec/controllers/news_controller_spec.rb
	deleted:    spec/controllers/profil_controller_spec.rb
	deleted:    spec/controllers/search_controller_spec.rb
	deleted:    spec/controllers/setting_controller_spec.rb
	deleted:    spec/controllers/slides_controller_spec.rb
	deleted:    spec/controllers/users/omniauth_callbacks_controller_spec.rb
	deleted:    spec/helpers/admin_helper_spec.rb
	deleted:    spec/helpers/ads_helper_spec.rb
	deleted:    spec/helpers/announcements_helper_spec.rb
	deleted:    spec/helpers/cartoons_helper_spec.rb
	deleted:    spec/helpers/comments_helper_spec.rb
	deleted:    spec/helpers/kinofilm_helper_spec.rb
	deleted:    spec/helpers/news_helper_spec.rb
	deleted:    spec/helpers/profil_helper_spec.rb
	deleted:    spec/helpers/search_helper_spec.rb
	deleted:    spec/helpers/setting_helper_spec.rb
	deleted:    spec/helpers/slides_helper_spec.rb
	deleted:    spec/helpers/users/omniauth_callbacks_helper_spec.rb
	deleted:    spec/models/ad_spec.rb
	deleted:    spec/models/announcement_spec.rb
	deleted:    spec/models/comment_spec.rb
	deleted:    spec/models/janr_spec.rb
	deleted:    spec/models/news_spec.rb
	deleted:    spec/models/role_spec.rb
	deleted:    spec/models/setting_spec.rb
	deleted:    spec/models/slide_spec.rb
	deleted:    spec/models/user_spec.rb
	deleted:    spec/models/users_role_spec.rb
	deleted:    spec/requests/ads_spec.rb
	deleted:    spec/requests/announcements_spec.rb
	deleted:    spec/requests/news_spec.rb
	deleted:    spec/requests/slides_spec.rb
	deleted:    spec/routing/ads_routing_spec.rb
	deleted:    spec/routing/announcements_routing_spec.rb
	deleted:    spec/routing/news_routing_spec.rb
	deleted:    spec/routing/slides_routing_spec.rb
	deleted:    spec/views/admin/index.html.erb_spec.rb
	deleted:    spec/views/ads/edit.html.erb_spec.rb
	deleted:    spec/views/ads/index.html.erb_spec.rb
	deleted:    spec/views/ads/new.html.erb_spec.rb
	deleted:    spec/views/ads/show.html.erb_spec.rb
	deleted:    spec/views/announcements/edit.html.erb_spec.rb
	deleted:    spec/views/announcements/index.html.erb_spec.rb
	deleted:    spec/views/announcements/new.html.erb_spec.rb
	deleted:    spec/views/announcements/show.html.erb_spec.rb
	deleted:    spec/views/cartoons/index.html.erb_spec.rb
	deleted:    spec/views/kinofilm/index.html.erb_spec.rb
	deleted:    spec/views/news/edit.html.erb_spec.rb
	deleted:    spec/views/news/index.html.erb_spec.rb
	deleted:    spec/views/news/new.html.erb_spec.rb
	deleted:    spec/views/news/show.html.erb_spec.rb
	deleted:    spec/views/profil/controller.html.erb_spec.rb
	deleted:    spec/views/profil/edit.html.erb_spec.rb
	deleted:    spec/views/profil/index.html.erb_spec.rb
	deleted:    spec/views/profil/update.html.erb_spec.rb
	deleted:    spec/views/search/index.html.erb_spec.rb
	deleted:    spec/views/slides/edit.html.erb_spec.rb
	deleted:    spec/views/slides/index.html.erb_spec.rb
	deleted:    spec/views/slides/new.html.erb_spec.rb
	deleted:    spec/views/slides/show.html.erb_spec.rb
	deleted:    spec/views/users/omniauth_callbacks/facebook.html.erb_spec.rb
	deleted:    spec/views/users/omniauth_callbacks/vkontakte.html.erb_spec.rb
Merge branch 'master' of https://github.com/kasabian/project_film into news_correct