added homework
Merge
Merge branch 'jammiii-master'