.
Merge branch 'master' of github.com:theraphim/smartpxe

Conflicts:
	server/servehttp.go
.