initial master
push it!
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	.travis.yml
	goodreads/__init__.py
	setup.py