added class diagram
applied coding conventions
Merge branch 'master' of https://github.com/mrm1st3r/cocktailSimulator