New file.
Added text to file.
Awesome text
Playing with branching.
Manufacturing conflict
Manufacturing conflict
Merge branch 'feature_1'

Conflicts:
	hello.txt
Merge branch 'master' of github.com:ErickaMJohnson/test