first
Merge branch 'master' of https://github.com/coweaver/stuffPractice
did stuff
Merge branch 'add'
Merge branch 'master' of https://github.com/coweaver/stuffPractice

Conflicts:
	test.txt
Merge pull request #1 from coweaver/master

test this