Remove workspace.xml from .idea directory.
Merge remote-tracking branch 'origin/master' into feature/builder
Struggle with creating inner class.