--Cache
Merge branch 'master' of github.com:edmundhighcock/simpledataio
--merge

Conflicts:
	autom4te.cache/requests
--deleted requests