Added problems and problem categories.
Merge remote-tracking branch 'origin/master'