committing before merging awesome changes
Merge branch 'master' of https://github.com/zort/CSC309-Assignments

Conflicts:
	index.html
a
Merge branch 'master' of https://github.com/zort/CSC309-Assignments

Conflicts:
	index.html
	main.css