merging
merging
Merge branch 'master' of https://github.com/andeek/ExtensiveAssignments
finished homo model