Showing Joseph branch stuff.
This commit is to test how github handles cherry-picking.
A commit so I've got some real differences between this branch and the one I'll cherry-pick from.
Another commit to make sure my branches have some real differences between them.
Yet another test to make sure there's some difference between branches.
This commit is to test how github handles cherry-picking.
Merge branch 'cptest'
modified readme
Commiting changes to test.html
Merge git://github.com/stephyma/git-practice
changes newfile.txt
Causing a merge conflict!
Merge git://github.com/abztrakt/git-practice

Conflicts:
	newfile.txt