Added homework
Merge branch 'master' into staging
needed