Merge branch 'master' of https://github.com/messianos/pci_server.git

Conflicts:
	Debug/pci_server
	Debug/src/pci_server.o
	Debug/src/pci_template.o