fixing
Merge branch 'master' of https://github.com/imtibbet/McGrathResearch

Conflicts:
	CUSSR2014Poster.ppt
kjhg