Daemon.py is the python-based server which runs on the user's laptop
preparing to merge
Merge branch 'master' of github.com:bonnie-e/bib-web-2