Initialize repository
Merge branch 'master' of https://github.com/atretyak1985/StudioDesign

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	config/initializers/secret_token.rb
	config/routes.rb