Final version of hw2
Merge branch 'hw2'
Merge branch 'master' of https://github.com/cruftyeye/GA-Homework