change some file from html to haml
Merge branch 'master' of github.com:diegoa87/unmes
Merge branch 'master' of github.com:diegoa87/unmes
merging home.html.haml
Merge branch 'master' of github.com:diegoa87/unmes
add analytics
fixing merge problem