Config file
Merge branch 'master' of git://github.com/Aaronneyer/sandwich
Add server.py to serve files in the user's specified share dir
Merge branch 'master' of git://github.com/dwaxemberg/sandwich
Add simple server and client code, with streaming
add /neighbors request for bootstrapping
Added a webapp that displays local index
Merge branch 'webapp' of git://github.com/dwaxemberg/sandwich

Conflicts:
	sandwich/config.py
added capability of using ~/ shortcut for path
shit happened
Merge branch 'monitoring' of git://github.com/Aaronneyer/sandwich

Conflicts:
	sandwich/config.py
	sandwich/server.py
Merge branch 'webapp' of git://github.com/dwaxemberg/sandwich

Conflicts:
	sandwich/config.py