cooldude

Ciaran is a pretty cool guy
trying to fix merge issues
Merge branch 'master' of https://github.com/smurugan10/CSC210

Conflicts:
	people/ciaran.html