some changes
some changes
Merge pull request #77 from emocentmagar/khoste

Khoste
Merge branch 'master' of https://github.com/emocentmagar/fishtail-travel into mitav
Merge pull request #78 from emocentmagar/mitav

Mitav
Merge pull request #79 from emocentmagar/khoste

Khoste
favicon added
add video conflict added
Merge pull request #80 from emocentmagar/lalit

Lalit
testimonial final
Merge pull request #81 from emocentmagar/lalit

testimonial final
testimonial desc
Merge pull request #82 from emocentmagar/lalit

testimonial desc
database update gaar
Merge branch 'master' of https://github.com/emocentmagar/fishtail-travel into khoste