first commit
Merge pull request #1 from travisreed-wf/master

First Pull Request.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md