updates to java basics
Merge branch 'master' of https://github.com/christensenacademy/christensen-academy