Merge Conflict Resolution testing
Merge Resolution performed
Merge branch 'master' of https://github.com/ArunMichaelDsouza/-Test--CSS-Foundations-Work

Conflicts:
	index.html