pulling updates
conflit resolution
Merge branch 'master' of github.com:thekevlau/thekevlau.github.io

Conflicts:
	index.html