Detailed Class Diagrams - update 2
Pattern notes
Resolved merge conflict