completes week assignment 2, chapter 4, java programming

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
completes week assignment 3, chapter 4, java programming

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'master' of github.com:plastboks/HiOA