assignment 2
Merge branch 'master' of https://github.com/sjcx/GA-FEWD into gh-pages