Merge
added a comment
Merge branch 'master' of https://github.com/mekkah/BioServer

Conflicts:
	bioimplementation.cpp
	server.cpp
added