Finished q4
Merge pull request #5 from isaiahyoon/q4

Finished q4