wip
Review poli 260 and eosc 114
Merge pull request #2 from isha/review

Review