v1
v2
Merge pull request #5 from kevin-moorer/feature1

Feature1 update
this is combo change
keeper
might conflict
Update test.txt
Update test.txt
numbers added
change with a file added
new change
attempt to undo 86271e0
Merge pull request #6 from kevin-moorer/undo_try2

attempt to undo 86271e0
multi 1
multi 2
multi 3
after the multi
Revert "multi 1"

This reverts commit 4d4aaeeec6348b4ef8c1d627cf87d6baf027f578.
Revert "Merge pull request #6 from kevin-moorer/undo_try2"

This reverts commit d8af07592161d7d8a2f507a92d90c511dc9924ad, reversing
changes made to 339206ae8193fc7baee90411bbf39ac3e684f313.

Conflicts:
	test.txt
soft reset squashed into 1