Merge pull request #1 from sperez4mba/feature-2

Feature 2
first commit to feature1.txt
second commit to feature1.txt
third commit to feature1.txt
Merge branch 'master' of https://github.com/sperez4mba/git_tutorial into feature1
Merge pull request #2 from sperez4mba/feature1

Feature1
Merge branch 'master' of github.com:sperez4mba/git_tutorial into feature-2