my first commit on a branch
Merge branch 'master' of github.com:swiftsam/branchdemo
manually reconcilling angela an my changes