Comments 1/2
Update
Update
Update
Merge branch 'master' of https://github.com/Lord-Simon/btlib

Conflicts:
	.travis.yml
	README.md
	btlib/models.py
	btlib/urls.py