Project 1 Files
Project2 Upload 1
Merge branch 'gh-pages' of https://github.com/CourtneyWalsh/DGMD20-Assignment-2 into gh-pages

Conflicts:
	about.html
	contact.html
	images/4th.png
	images/4th.psd
	images/55.png
	images/55.psd
	images/94.png
	images/94.psd
	images/JREmailHeader.png
	images/aboutimg1.jpg
	images/aboutimg1.psd
	images/aboutimg2.jpg
	images/aboutimg2.psd
	images/aboutimg3.jpg
	images/aboutimg3.psd
	images/banner1.jpg
	images/banner1.png
	images/banner1.psd
	images/banner2.jpg
	images/banner2.png
	images/banner2.psd
	images/banner3.jpg
	images/banner3.psd
	images/banner3a.psd
	images/banner3b.psd
	images/banner4.jpg
	images/banner4.psd
	images/bottom.png
	images/graphic1.png
	images/graphic1.psd
	images/graphic2.png
	images/graphic2.psd
	images/graphic3.png
	images/graphic3.psd
	images/headerlogo.png
	images/headerlogo.psd
	images/logo.jpg
	images/logo.png
	images/logo.psd
	index.html
Project2 Upload 2