finished 1.1
finished 1.1.
Merge branch 'master' of https://github.com/bchan8/cs499