added uml diagrams
updated an ignore file
resolving merge