ignoring virtualenv
added sample.py
added sphinx to requirements so we can build docs
Merge remote-tracking branch 'upstream/master'
eof line