push
Merge pull request #7 from TylerQiu/master

push for Tyler