reset
Merge branch 'master' of https://www.github.com/adretaliate/travetor
views+html