Finished q1
Merge pull request #3 from isaiahyoon/q1

Finished q1