Changed the composite pattern implementation a bit. 
Finished decorator pattern.
Updated UML and final submission 2 code