Attempting to prevent anyone from adding Mac's .dsstore file thing
Fixed main class diagram
Merge branch 'master' into Lucia_branch