added student contributions
conflicts
deleted dsstore