Merge branch 'readme' into 'milestone-1'

Updated README and changed Class diagram

See merge request !20