change some files
Merge pull request #14 from iu2fish/editbranch

change some files