123
Merge branch 'master' of https://github.com/RomanVolkov/SchoolSite

Conflicts:
	Gemfile
	Gemfile.lock