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

Conflicts:
	app/views/layouts/application.html.erb