Merge branch 'master' into develop
subjects to study later
billy has been added
Merge branch 'develop'