contacts added
Merge branch 'master' into gh-pages

* master:
  contacts added

Conflicts:
	contact.html