Merge branch 'master' of github.com:nitzanav/ServePal

Conflicts:
	Gemfile.lock
	app/views/problems/_edit_form.html.erb
	config/routes.rb
	db/schema.rb
dsa