dfvfg
gfghfgh
Merge branch 'master' into highpriority-james

Conflicts:
	app/views/projects/_form.html.erb
	app/views/projects/show.html.erb
	app/views/shared/_tools_list.html.erb