Fixed merge conflicts
Resolve merge conflicts
Deleted empty command output
Merge branch 'MutiFileHashMap' into JUnit
Deleted empty command invitation
Merge branch 'JUnit' into Storeable
Deleted empty command invitation