Merge pull request #1 from ginacollecchia/master

merging in first steps