can show some jobs
Merge branch 'master' of github.com:juliamitchelmore/minijobs

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