Merge pull request #3 from brthur/2feature

eeing if we can get a branch to firstshort
Merge pull request #4 from brthur/master

Create 1conflict.txt
Merge pull request #6 from brthur/master

added a bunch of puppets to one file