Merge pull request #1 from ginacollecchia/master

merging in first steps
Merge pull request #5 from szeitlin/master

Merge pull request #1 from ginacollecchia/master