Reorganized diploma, started merging.
Cleaned up.
Merge remote-tracking branch 'origin/diploma'