No semicolons. Bad
Restructured
Merge remote-tracking branch 'origin/master'

Conflicts:
	daemon/src/daemon.py
Merge branch 'master' of https://github.com/nilesr/tpm-client