updated all files
Merge pull request #1 from dlcoffee/merge-into-master

updated all files