changing contact emails
adding testimonium to te webpage
conflict on home solved
Merge branch 'master' of https://github.com/diegoa87/unmes