working on some JS
Merge branch 'master' into adam

Conflicts:
	app/views/projects/show.html.erb