adding some adult bits and pieces
Merge branch 'master' of github.com:juliamitchelmore/minijobs

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