initial comit
Merge pull request #1 from samzhao88/master

initial comit