Update 1conflict.txt
bb commits 1conflt
second conflict attempt.puppet
Merge remote branch 'origin/master' into testconflict

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

added a bunch of puppets to one file