assignment 1 & 2

finally figured out how to do pull request