save
Merge branch 'master' of github.com:nickfreeman/scratchpaper

Conflicts:
	db/seeds.rb
add/remove javascript insertion works
contributor buttons now change
Merge branch 'master' of github.com:nickfreeman/scratchpaper