changed hello.txt file
for a tutorial
creating conflicts
Causing a conflict
Merge branch 'master' of https://github.com/abztrakt/git-practice

Conflicts:
	haha.html
Updates!
adding commit to new branch
Merge branch 'master' of https://github.com/abztrakt/git-practice
Merge pull request #2 from abztrakt/new_branch

adding commit to new branch
Be more explicit about the forms of some of these example commands.
changed files to practice git
Causing a conflict.
Merge branch 'master' of https://github.com/abztrakt/git-practice

Conflicts:
	newfile.txt
added a line
merged conflicts
Causing a conflict for Austin.
Merge branch 'master' of https://github.com/abztrakt/git-practice
practice for austin gebauer
Merge branch 'master' of https://github.com/abztrakt/git-practice

Conflicts:
	newfile.txt
adding a new file
Merge pull request #4 from abztrakt/new_branch_austin

adding a new file