"sdfsdfds"
Merge branch 'master' of https://github.com/raa53/diploma
"dsfds"
Conflicts:
	Gemfile.lock