Merge pull request #1 from d-tsui/master

get derek's file from master
pushed edited file1 to justin branch
fixed merge conflicts
Merge pull request #2 from d-tsui/master

pull request with master