Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/__init__.pyc
	lib/bs4/__init__.py
	lib/bs4/__init__.pyc
	lib/bs4/builder/__init__.py
	lib/bs4/builder/__init__.pyc
	lib/bs4/builder/_html5lib.py
	lib/bs4/builder/_html5lib.pyc
	lib/bs4/builder/_htmlparser.py
	lib/bs4/builder/_htmlparser.pyc
	lib/bs4/builder/_lxml.py
	lib/bs4/builder/_lxml.pyc
	lib/bs4/dammit.py
	lib/bs4/dammit.pyc
	lib/bs4/element.py
	lib/bs4/element.pyc
	lib/bs4/testing.py
	lib/bs4/testing.pyc
	lib/bs4/tests/__init__.pyc
	lib/bs4/tests/test_builder_registry.pyc
	lib/bs4/tests/test_docs.pyc
	lib/bs4/tests/test_html5lib.py
	lib/bs4/tests/test_html5lib.pyc
	lib/bs4/tests/test_htmlparser.pyc
	lib/bs4/tests/test_lxml.py
	lib/bs4/tests/test_lxml.pyc
	lib/bs4/tests/test_soup.py
	lib/bs4/tests/test_soup.pyc
	lib/bs4/tests/test_tree.py
	lib/bs4/tests/test_tree.pyc
	lib/requests/__init__.pyc
	lib/requests/adapters.pyc
	lib/requests/api.pyc
	lib/requests/auth.pyc
	lib/requests/certs.pyc
	lib/requests/compat.pyc
	lib/requests/cookies.pyc
	lib/requests/exceptions.pyc
	lib/requests/hooks.pyc
	lib/requests/models.pyc
	lib/requests/packages/__init__.pyc
	lib/requests/packages/chardet/__init__.pyc
	lib/requests/packages/urllib3/__init__.pyc
	lib/requests/packages/urllib3/_collections.pyc
	lib/requests/packages/urllib3/connection.pyc
	lib/requests/packages/urllib3/connectionpool.pyc
	lib/requests/packages/urllib3/contrib/__init__.pyc
	lib/requests/packages/urllib3/contrib/pyopenssl.pyc
	lib/requests/packages/urllib3/exceptions.pyc
	lib/requests/packages/urllib3/fields.pyc
	lib/requests/packages/urllib3/filepost.pyc
	lib/requests/packages/urllib3/packages/__init__.pyc
	lib/requests/packages/urllib3/packages/ordered_dict.pyc
	lib/requests/packages/urllib3/packages/six.pyc
	lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyc
	lib/requests/packages/urllib3/poolmanager.pyc
	lib/requests/packages/urllib3/request.pyc
	lib/requests/packages/urllib3/response.pyc
	lib/requests/packages/urllib3/util/__init__.pyc
	lib/requests/packages/urllib3/util/connection.pyc
	lib/requests/packages/urllib3/util/request.pyc
	lib/requests/packages/urllib3/util/response.pyc
	lib/requests/packages/urllib3/util/retry.pyc
	lib/requests/packages/urllib3/util/ssl_.pyc
	lib/requests/packages/urllib3/util/timeout.pyc
	lib/requests/packages/urllib3/util/url.pyc
	lib/requests/sessions.pyc
	lib/requests/status_codes.pyc
	lib/requests/structures.pyc
	lib/requests/utils.pyc
	steamtrades.py

New Version