add workshops page
resolve conflicts
add voting model
resolve conflicts