More space
merged

Merge branch 'master' of github.com:michbur/dpcr_congress

Conflicts:
	poster.Rnw
merged

Merge branch 'master' of github.com:michbur/dpcr_congress

Conflicts:
	poster.Rnw