Merge pull request #1 from angeljintong/master

Angel's first commit
Monica's test commit
mergins