salut conflict
Merge branch 'master' of h.github.com:hermanos/bootcamp01

Conflicts:
	contact.html