Merge branch 'develop' of https://github.com/avanthay/zhaw_mppc into develop
add equals & hashcode to Word & Register
Merge branch 'develop' of https://github.com/avanthay/zhaw_mppc into develop

manual merge