Joseph Ahlbrandt
Merge pull request #6 remote-tracking branch 'joseph/master'

Conflicts:
	README.md