language modification working
language conflicts resolved
functional gallery, extra options, h1 listing issues done
extra options, funcational gallery, language maintain in session, h1 listing done
conflict resolved
conflict resolved
few changes
conflicts resolved in various pages
conflicts resolved after merging branch
some changes in trips/show
conflicts done
bugs completed
conflicts resolved
conflicts resolved in master after merge branch