Merge
Merge branch 'master' of github.com:mlschmidt/projectCourse
Merge branch 'master' of github.com:mlschmidt/projectCourse
Renamed Abstract classes, made Sky and Water part of virtualWorld (simple wrapper class, quite pointless at the moment)