viewing problem and submit solution by mimi and saeed
Resolved conflicts between saeed and mimi
Fixed HTML bug in views/problems/show.html.erb
Synch with C3: Resolved conflicts.
resolving all conflicts