all set ready to merge in with dan
Merge branch 'master' of github.com:sociam/socm2013-health-social-machines

Conflicts:
	health-social-machines.pdf