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

Conflicts:
	app/views/problems/index.html.erb