first week work
Merge pull request #3 from esthermun/master

first week work