first commit
Merge branch 'workshopstyle' of https://github.com/ging/vish into workshopstyle
Merge branch 'storyrobin' of https://github.com/ging/vish into workshopstyle
dragable
Fix contest view
editing workshop title
css workshop
merge
fixing merge
toolbar elements
merge style edit
bug toolbar workshop element
workshop edit assignment
workshop show
workshop show
fixing merge
Merge branch 'storyrobin' of https://github.com/ging/vish into workshopstyle

Conflicts:
	app/views/wa_assignments/_wa_assignment_edit.html.erb
Merge branch 'master' of https://github.com/ging/vish into storyrobin
Merge branch 'workshopstyle' of https://github.com/ging/vish into storyrobin