testing commit
testing commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge pull request #2 from davidpricedev/master

trying again.