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
main page
main page
adding fittings creating
main page, added partial girl
Merge pull request #36 from lvl0nax/request_for_fitting

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

Conflicts:
	app/views/layouts/_header.html.haml
delete images
Merge pull request #35 from Neodelf/bugs

main page
Merge branch 'master' of github.com:lvl0nax/topaza