Merging
Merge branch 'master' of https://github.com/TedStudley/CIG-html-poster-template

Conflicts:
	Poster.pdf
	Poster.svg