Many commits, from layout adjustments, addition of new pages, new file path for images, etc.
Merge branch 'master' of https://github.com/ncheung/iat381_p02

Conflicts:
	Website/css/style.css