testing again

testing github setup again...
Merge pull request #1 from kjgregory/master

testing again