Merge pull request #1 from ga-students/master

update master