Merge pull request #52 from emocentmagar/lalit

Lalit
some changes
Merge branch 'master' of https://github.com/emocentmagar/fishtail-travel into mitav
some changes
Merge pull request #53 from emocentmagar/mitav

Mitav
error fixed
Merge pull request #54 from emocentmagar/krazz

error fixed
some changes
Merge pull request #55 from emocentmagar/mitav

some changes
about us
Merge branch 'master' of https://github.com/emocentmagar/fishtail-travel into krazz
booking and minor changes added
Merge pull request #56 from emocentmagar/krazz

Krazz
conflict merged