romka_commit_1
Merge branch 'master' of https://github.com/Nefochka/Par_bootstrap

Conflicts:
	Gemfile