Update example config
Merge branch 'master' of https://github.com/sandwich-share/sandwich
Add timeouts to http requests
Merge branch 'master' of github.com:sandwich-share/sandwich

Conflicts:
	sandwich/webapp.py
ACTUALLY fixed the merge this time
Make shared directory path OS-independent in example config
automatically add peers who connect
Remove extra debug set
Merge branch 'master' of github.com:sandwich-share/sandwich
Revert "Remove extra debug set"

This reverts commit 945583909d9b7241f977a3b5ac611d69979c5691.
Stuff that does stuff
Fixed peer list updating again
Get peer files
Fixed searching
added url return in index query
Radically rewrote the server, moved pretty much everything to flask
Merge branch 'master' of github.com:sandwich-share/sandwich

Conflicts:
	sandwich/server.py
	sandwich/webapp.py
re-fixed the merge
removed redundancy
Merge branch 'master' of github.com:sandwich-share/sandwich

* 'master' of github.com:sandwich-share/sandwich:
  re-fixed the merge