finished my homework
finished homework 2
Merge pull request #4 from fujiboy/master

Get Homework 2