Gemfile unicorn and capistrano added
unicorn config added
capistrano added
postgresql
Merge pull request #1 from kalashnikovisme/postgres

postgresql
Merge branch 'development'

* development: (86 commits)
  add genres to welcome_index_page
  add video_decorator which paste video to page
  add new_video_button to genres_views
  add photogalary
  mini refactoring
  add location to app...haml
  add welcome_controller_test
  add welcome_controller and view
  video links fixed
  test fix
  fixed genres_controller_test; edited genres views; added photo resize to uploader
  add good genres migration
  remove bad migration
  re-redirected all to lessons_path
  add lessons
  add update, edit, destroy to groups, categories and videos
  add categories_controller
  add to category seeds
  some adds
  add model category
  ...

Conflicts:
	Gemfile
some refactoring
Merge branch 'development'

* development:
  better photogalary
  add uniq gernes to teachers_index
  add icons of genres on teachers_index
  some fix
  some adds
  add teachers_index
  add about and contacts pages
  add footer
  better localiztion
  better make_up of main_page

Conflicts:
	app/views/layouts/application.html.haml
Merge branch 'development'

* development:
  some adds
  some refactoring in genres_index
  add show_genre_view
  make_up to genres_index
  some refactoring
  edit new and show teachers views
  make_up for teachersshowO
Merge branch 'development'

* development:
  add lesson_time_schedule
Merge branch 'development'

* development:
  many adds
  add BAD russian to group_spacew
  many adds
  some adds
  fix many things
  add admins rooles
  fix lessons_test
  remove bad validates
  add edit and destroy buttons to schedule
  add some tests to genres
  remove brackets
  add genres edit form
  add lessons time to schedule
  some adds
  add dependecies to models
  add validates_association to models
Update README.md
fix to RAILS_ENV=production rake:precomplie
add destroy to photos
something
add back button to admins photos
add admins to teacher_photos
commit changes
fix photos_controller_test
Update database.yml