first week of work
Merge pull request #4 from ada-linda/master

first week of work