start to make fitting
start to make fitting
adding dresses to fitting
Merge branch '34-try-dress' into request_for_fitting

Conflicts:
	config/routes.rb
added pagination
fixed pagination
fixed dresses_controller.rb
Merge pull request #30 from Neodelf/pagination

added pagination
Merge pull request #32 from Neodelf/bugs

before saving set first image as main
Merge pull request #33 from Neodelf/bugs

added images
adding fittings creating
Merge pull request #36 from lvl0nax/request_for_fitting

Request for fitting
Merge branch 'dev' of github.com:lvl0nax/topaza into bugs

Conflicts:
	app/views/layouts/_header.html.haml