2nd commit
Merge branch 'master' of https://github.com/mehediworld/gallaxy-mehedi
2nd commit
Conflicts:
	Demo/.DS_Store
	Demo/Thumbs.db
	Demo/pixma-flat.png
	Demo/pixma-general.png
	about-2.html
	about-me.html
	about.html
	blog-full-width.html
	blog-right-sidebar.html
	contact-2.html
	contact.html
	css/.DS_Store
	css/animations.css
	css/bootstrap-theme.css
	css/bootstrap-theme.css.map
	css/bootstrap-theme.min.css
	css/bootstrap.css
	css/bootstrap.css.map
	css/bootstrap.min.css
	css/colors/blue.css
	css/colors/brown.css
	css/colors/golden.css
	css/colors/gray.css
	css/colors/green.css
	css/colors/magenta.css
	css/colors/orange.css
	css/colors/purple.css
	css/colors/red.css
	css/colors/teal.css
	css/coming-soon.css
	css/countdown.css
	css/demo.css
	css/fonts/.DS_Store
	css/fonts/font-awesome/.DS_Store
	css/fonts/font-awesome/css/font-awesome.css
	css/fonts/font-awesome/css/font-awesome.min.css
	css/fonts/font-awesome/fonts/FontAwesome.otf
	css/fonts/font-awesome/fonts/fontawesome-webfont.eot
	css/fonts/font-awesome/fonts/fontawesome-webfont.svg
	css/fonts/font-awesome/fonts/fontawesome-webfont.ttf
	css/fonts/font-awesome/fonts/fontawesome-webfont.woff
	css/fonts/font-awesome/less/bordered-pulled.less
	css/fonts/font-awesome/less/core.less
	css/fonts/font-awesome/less/fixed-width.less
	css/fonts/font-awesome/less/font-awesome.less
	css/fonts/font-awesome/less/icons.less
	css/fonts/font-awesome/less/larger.less
	css/fonts/font-awesome/less/list.less
	css/fonts/font-awesome/less/mixins.less
	css/fonts/font-awesome/less/path.less
	css/fonts/font-awesome/less/rotated-flipped.less
	css/fonts/font-awesome/less/spinning.less
	css/fonts/font-awesome/less/stacked.less
	css/fonts/font-awesome/less/variables.less
	css/fonts/font-awesome/old/.DS_Store
	css/fonts/font-awesome/old/css/font-awesome-ie7.css
	css/fonts/font-awesome/old/css/font-awesome-ie7.min.css
	css/fonts/font-awesome/old/css/font-awesome.css
	css/fonts/font-awesome/old/css/font-awesome.min.css
	css/fonts/font-awesome/old/font/FontAwesome.otf
	css/fonts/font-awesome/old/font/fontawesome-webfont.eot
	css/fonts/font-awesome/old/font/fontawesome-webfont.svg
	css/fonts/font-awesome/old/font/fontawesome-webfont.ttf
	css/fonts/font-awesome/old/font/fontawesome-webfont.woff
	css/fonts/font-awesome/old/less/bootstrap.less
	css/fonts/font-awesome/old/less/core.less
	css/fonts/font-awesome/old/less/extras.less
	css/fonts/font-awesome/old/less/font-awesome-ie7.less
	css/fonts/font-awesome/old/less/font-awesome.less
	css/fonts/font-awesome/old/less/icons.less
	css/fonts/font-awesome/old/less/mixins.less
	css/fonts/font-awesome/old/less/path.less
	css/fonts/font-awesome/old/less/variables.less
	css/fonts/font-awesome/old/scss/_bootstrap.scss
	css/fonts/font-awesome/old/scss/_core.scss
	css/fonts/font-awesome/old/scss/_extras.scss
	css/fonts/font-awesome/old/scss/_icons.scss
	css/fonts/font-awesome/old/scss/_mixins.scss
	css/fonts/font-awesome/old/scss/_path.scss
	css/fonts/font-awesome/old/scss/_variables.scss
	css/fonts/font-awesome/old/scss/font-awesome-ie7.scss
	css/fonts/font-awesome/old/scss/font-awesome.scss
	css/fonts/font-awesome/scss/_bordered-pulled.scss
	css/fonts/font-awesome/scss/_core.scss
	css/fonts/font-awesome/scss/_fixed-width.scss
	css/fonts/font-awesome/scss/_icons.scss
	css/fonts/font-awesome/scss/_larger.scss
	css/fonts/font-awesome/scss/_list.scss
	css/fonts/font-awesome/scss/_mixins.scss
	css/fonts/font-awesome/scss/_path.scss
	css/fonts/font-awesome/scss/_rotated-flipped.scss
	css/fonts/font-awesome/scss/_spinning.scss
	css/fonts/font-awesome/scss/_stacked.scss
	css/fonts/font-awesome/scss/_variables.scss
	css/fonts/font-awesome/scss/font-awesome.scss
	css/global.css
	css/graph.css
	css/ie.css
	css/jquery.countdown.css
	css/nivo-slider.css
	css/prettyPhoto.css
	css/pricing-table.css
	css/revolution-slider/.DS_Store
	css/revolution-slider/css/.DS_Store
	css/spectrum.css
	css/style.css
	css/superfish.css
	css/switcher.css
	css/team-member.css
	css/theme-responsive.css
	done-pages.txt
	faq-two.html
	faq.html
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	full-width-two.html
	full-width.html
	icons.html
	images/bottom-footer-bg.jpg
	images/main-header-bg - Copy.jpg
	images/main-header-bg.jpg
	images/top-bar-bg.jpg
	images/top-footer-bg.jpg
	img/.DS_Store
	img/about-2.jpg
	img/about.jpg
	img/ads-small.jpg
	img/backgrounds/6.jpg
	img/backgrounds/7.jpg
	img/bg-black.png
	img/bg_off.png
	img/blog/.DS_Store
	img/blog/01.jpg
	img/blog/02.jpg
	img/blog/03.jpg
	img/blog/04.jpg
	img/blog/blog-post1.jpg
	img/blog/blog-post2.jpg
	img/blog/blog-post3.jpg
	img/blog/blog-post4.jpg
	img/blog/blog-post5.jpg
	img/blog/logo.png
	img/check.png
	img/clientslogo/.DS_Store
	img/clientslogo/01.png
	img/clientslogo/02.png
	img/clientslogo/03.png
	img/clientslogo/04.png
	img/clientslogo/intel.png
	img/clientslogo/logo-1.png
	img/clientslogo/logo-2.png
	img/clientslogo/logo-3.png
	img/clientslogo/logo-4.png
	img/clientslogo/logo-5.png
	img/contact-map.png
	img/doublearrow2.png
	img/fifo-small.jpg
	img/glow.png
	img/glyphicons-halflings-white.png
	img/glyphicons-halflings.png
	img/greyline.png
	img/ico/.DS_Store
	img/ico/apple-touch-icon-114.png
	img/ico/apple-touch-icon-144.png
	img/ico/apple-touch-icon-57.png
	img/ico/apple-touch-icon-72.png
	img/ico/apple-touch-icon.png
	img/ico/favicon.ico
	img/icons/corporate-solutions.png
	img/icons/email-marketing.png
	img/icons/web-design.png
	img/img-bg-blur.jpg
	img/img-blur-lead2.jpg
	img/iphone5c.png
	img/loader.gif
	img/logo-demo.png
	img/pattern-3.png
	img/pattern.jpg
	img/pattern.png
	img/patterns/.DS_Store
	img/patterns/dark_wood.png
	img/patterns/debut_dark.png
	img/patterns/denim.png
	img/patterns/fabrics_gray.png
	img/patterns/grey_wash.png
	img/patterns/lghtmesh.png
	img/patterns/padded.png
	img/patterns/retina_wood.png
	img/patterns/roughcloth.png
	img/patterns/subtle_grunge.png
	img/patterns/textured_paper.png
	img/patterns/tileable_wood.png
	img/patterns/wall.png
	img/patterns/whitey.png
	img/placeholder-img.jpg
	img/portfolio/.DS_Store
	img/portfolio/01.jpg
	img/portfolio/02.jpg
	img/portfolio/03.jpg
	img/portfolio/04.jpg
	img/portfolio/05.jpg
	img/portfolio/06.jpg
	img/portfolio/portfolio-1.jpg
	img/portfolio/portfolio-10.jpg
	img/portfolio/portfolio-11.jpg
	img/portfolio/portfolio-12.jpg
	img/portfolio/portfolio-2.jpg
	img/portfolio/portfolio-3.jpg
	img/portfolio/portfolio-4.jpg
	img/portfolio/portfolio-5.jpg
	img/portfolio/portfolio-6.jpg
	img/portfolio/portfolio-7.jpg
	img/portfolio/portfolio-8.jpg
	img/portfolio/portfolio-9.jpg
	img/portfolio/single-portfolio-image.jpg
	img/prettyPhoto/dark_rounded/btnNext.png
	img/prettyPhoto/dark_rounded/btnPrevious.png
	img/prettyPhoto/dark_rounded/contentPattern.png
	img/prettyPhoto/dark_rounded/default_thumbnail.gif
	img/prettyPhoto/dark_rounded/loader.gif
	img/prettyPhoto/dark_rounded/sprite.png
	img/prettyPhoto/dark_square/btnNext.png
	img/prettyPhoto/dark_square/btnPrevious.png
	img/prettyPhoto/dark_square/contentPattern.png
	img/prettyPhoto/dark_square/default_thumbnail.gif
	img/prettyPhoto/dark_square/loader.gif
	img/prettyPhoto/dark_square/sprite.png
	img/prettyPhoto/default/default_thumb.png
	img/prettyPhoto/default/loader.gif
	img/prettyPhoto/default/sprite.png
	img/prettyPhoto/default/sprite_next.png
	img/prettyPhoto/default/sprite_prev.png
	img/prettyPhoto/default/sprite_x.png
	img/prettyPhoto/default/sprite_y.png
	img/prettyPhoto/facebook/btnNext.png
	img/prettyPhoto/facebook/btnPrevious.png
	img/prettyPhoto/facebook/contentPatternBottom.png
	img/prettyPhoto/facebook/contentPatternLeft.png
	img/prettyPhoto/facebook/contentPatternRight.png
	img/prettyPhoto/facebook/contentPatternTop.png
	img/prettyPhoto/facebook/default_thumbnail.gif
	img/prettyPhoto/facebook/loader.gif
	img/prettyPhoto/facebook/sprite.png
	img/prettyPhoto/light_rounded/btnNext.png
	img/prettyPhoto/light_rounded/btnPrevious.png
	img/prettyPhoto/light_rounded/default_thumbnail.gif
	img/prettyPhoto/light_rounded/loader.gif
	img/prettyPhoto/light_rounded/sprite.png
	img/prettyPhoto/light_square/btnNext.png
	img/prettyPhoto/light_square/btnPrevious.png
	img/prettyPhoto/light_square/default_thumbnail.gif
	img/prettyPhoto/light_square/loader.gif
	img/prettyPhoto/light_square/sprite.png
	img/px1.jpg
	img/recent-post-img.jpg
	img/redbg.jpg
	img/redbg.png
	img/redbg_big.png
	img/search-icon.png
	img/slider/.DS_Store
	img/slider/img1.jpg
	img/slider/img2.jpg
	img/slider/nivo_slider1.jpg
	img/slider/nivo_slider3.jpg
	img/slider/nivo_slider4.jpg
	img/slider/responsive-imac.png
	img/slider/responsive-ipad.png
	img/slider/responsive-iphone.png
	img/slider/slider-bg-1.jpg
	img/slider/slider-bg-2.jpg
	img/slider/slider-bg-3.jpg
	img/slider/slider-bg-5.jpg
	img/slider/slider-bg-6.jpg
	img/slider/slider-bg-7.jpg
	img/team-member-2.jpg
	img/team/team-member-1.jpg
	img/team/team-member-2.jpg
	img/team/team-member-3.jpg
	img/team/team-member-4.jpg
	img/team/team.jpg
	img/testimonial/team-member-1.jpg
	img/testimonial/team-member-2.jpg
	img/testimonial/team-member-3.jpg
	img/woman1.png
	index-1.html
	index-2-old.html
	index-2.html
	index-3.html
	index-4.html
	index-nivo.html
	index.html
	js/.DS_Store
	js/bootstrap.js
	js/bootstrap.min.js
	js/circularnav.js
	js/coming-soon.js
	js/custom.js
	js/imagesloaded.pkgd.min.js
	js/jflickrfeed.js
	js/jquery.backstretch.min.js
	js/jquery.cookie.js
	js/jquery.countdow2n.js
	js/jquery.countdown.js
	js/jquery.easing.1.3.js
	js/jquery.gmap.min.js
	js/jquery.isotope.js
	js/jquery.knob.js
	js/jquery.nivo.slider.pack.js
	js/jquery.prettyPhoto.js
	js/jquery.sticky.js
	js/jquery.wait.js
	js/modernizr-2.6.2.min.js
	js/modernizr.custom.04022.js
	js/portfolio.js
	js/respond.min.js
	js/revolution-slider/.DS_Store
	js/revolution-slider/pluginsources/jquery.themepunch.plugins.min.js
	js/revolution-slider/pluginsources/jquery.themepunch.revolution.js
	js/revolution-slider/settings.css
	js/revolution-slider/videojs/demo.captions.vtt
	js/revolution-slider/videojs/font/vjs.eot
	js/revolution-slider/videojs/font/vjs.svg
	js/revolution-slider/videojs/font/vjs.ttf
	js/revolution-slider/videojs/font/vjs.woff
	js/revolution-slider/videojs/video-js.min.css
	js/revolution-slider/videojs/video-js.png
	js/revolution-slider/videojs/video-js.swf
	js/revolution-slider/videojs/video.js
	js/spectrum.js
	js/superfish.js
	js/switcher.js
	js/tweetMachine.js
	js/tytabs.js
	js/waypoints.min.js
	page-404.html
	page-coming-soon.html
	page-left-navigation.html
	page-left-sidebar.html
	page-login.html
	page-right-navigation.html
	page-right-sidebar.html
	portfolio-four.html
	portfolio-full-width.html
	portfolio-single.html
	portfolio-three.html
	portfolio-two.html
	services-two.html
	services.html
	shortcodes.html
	single-post.html
	sitemap.html
	testimonials.html
2nd commit2nd commit
3rd commit
Merge branch 'master' of https://github.com/mehediworld/gallaxy-mehedi
3rd commit
Conflicts:
	about-2.html
	about-me.html
	about.html
	blog-full-width.html
	blog-left-sidebar.html
	blog-right-sidebar.html
	contact-2.html
	contact-3.html
	contact.html
	faq-two.html
	faq.html
	full-width-two.html
	full-width.html
	icons.html
	index-1.html
	index-2-old.html
	index-2.html
	index-3.html
	index-4.html
	index-nivo.html
	page-404.html
	page-coming-soon.html
	page-left-navigation.html
	page-left-sidebar.html
	page-login.html
	page-right-navigation.html
	page-right-sidebar.html
	portfolio-four.html
	portfolio-full-width.html
	portfolio-single-big.html
	portfolio-three.html
	portfolio-two.html
	pricing-table.html
	services-two.html
	services.html
	shortcodes.html
	single-post.html
	sitemap.html
	testimonials.html
commit for about-2
Merge branch 'master' of https://github.com/mehediworld/gallaxy-mehedi
commit about-2
Conflicts:
	.DS_Store
	Demo/.DS_Store
	Demo/Thumbs.db
	Demo/pixma-flat.png
	Demo/pixma-general.png
	about-2.html
	about-me.html
	about.html
	blog-left-sidebar.html
	contact-2.html
	contact-3.html
	contact.html
	css/.DS_Store
	css/animations.css
	css/bootstrap-theme.css
	css/bootstrap-theme.css.map
	css/bootstrap-theme.min.css
	css/bootstrap.css
	css/bootstrap.css.map
	css/bootstrap.min.css
	css/colors/blue.css
	css/colors/brown.css
	css/colors/golden.css
	css/colors/gray.css
	css/colors/green.css
	css/colors/magenta.css
	css/colors/orange.css
	css/colors/purple.css
	css/colors/red.css
	css/colors/teal.css
	css/coming-soon.css
	css/countdown.css
	css/demo.css
	css/fonts/.DS_Store
	css/fonts/font-awesome/.DS_Store
	css/fonts/font-awesome/css/font-awesome.css
	css/fonts/font-awesome/css/font-awesome.min.css
	css/fonts/font-awesome/fonts/FontAwesome.otf
	css/fonts/font-awesome/fonts/fontawesome-webfont.eot
	css/fonts/font-awesome/fonts/fontawesome-webfont.svg
	css/fonts/font-awesome/fonts/fontawesome-webfont.ttf
	css/fonts/font-awesome/fonts/fontawesome-webfont.woff
	css/fonts/font-awesome/less/bordered-pulled.less
	css/fonts/font-awesome/less/core.less
	css/fonts/font-awesome/less/fixed-width.less
	css/fonts/font-awesome/less/font-awesome.less
	css/fonts/font-awesome/less/icons.less
	css/fonts/font-awesome/less/larger.less
	css/fonts/font-awesome/less/list.less
	css/fonts/font-awesome/less/mixins.less
	css/fonts/font-awesome/less/path.less
	css/fonts/font-awesome/less/rotated-flipped.less
	css/fonts/font-awesome/less/spinning.less
	css/fonts/font-awesome/less/stacked.less
	css/fonts/font-awesome/less/variables.less
	css/fonts/font-awesome/old/.DS_Store
	css/fonts/font-awesome/old/css/font-awesome-ie7.css
	css/fonts/font-awesome/old/css/font-awesome-ie7.min.css
	css/fonts/font-awesome/old/css/font-awesome.css
	css/fonts/font-awesome/old/css/font-awesome.min.css
	css/fonts/font-awesome/old/font/FontAwesome.otf
	css/fonts/font-awesome/old/font/fontawesome-webfont.eot
	css/fonts/font-awesome/old/font/fontawesome-webfont.svg
	css/fonts/font-awesome/old/font/fontawesome-webfont.ttf
	css/fonts/font-awesome/old/font/fontawesome-webfont.woff
	css/fonts/font-awesome/old/less/bootstrap.less
	css/fonts/font-awesome/old/less/core.less
	css/fonts/font-awesome/old/less/extras.less
	css/fonts/font-awesome/old/less/font-awesome-ie7.less
	css/fonts/font-awesome/old/less/font-awesome.less
	css/fonts/font-awesome/old/less/icons.less
	css/fonts/font-awesome/old/less/mixins.less
	css/fonts/font-awesome/old/less/path.less
	css/fonts/font-awesome/old/less/variables.less
	css/fonts/font-awesome/old/scss/_bootstrap.scss
	css/fonts/font-awesome/old/scss/_core.scss
	css/fonts/font-awesome/old/scss/_extras.scss
	css/fonts/font-awesome/old/scss/_icons.scss
	css/fonts/font-awesome/old/scss/_mixins.scss
	css/fonts/font-awesome/old/scss/_path.scss
	css/fonts/font-awesome/old/scss/_variables.scss
	css/fonts/font-awesome/old/scss/font-awesome-ie7.scss
	css/fonts/font-awesome/old/scss/font-awesome.scss
	css/fonts/font-awesome/scss/_bordered-pulled.scss
	css/fonts/font-awesome/scss/_core.scss
	css/fonts/font-awesome/scss/_fixed-width.scss
	css/fonts/font-awesome/scss/_icons.scss
	css/fonts/font-awesome/scss/_larger.scss
	css/fonts/font-awesome/scss/_list.scss
	css/fonts/font-awesome/scss/_mixins.scss
	css/fonts/font-awesome/scss/_path.scss
	css/fonts/font-awesome/scss/_rotated-flipped.scss
	css/fonts/font-awesome/scss/_spinning.scss
	css/fonts/font-awesome/scss/_stacked.scss
	css/fonts/font-awesome/scss/_variables.scss
	css/fonts/font-awesome/scss/font-awesome.scss
	css/global.css
	css/graph.css
	css/ie.css
	css/jquery.countdown.css
	css/nivo-slider.css
	css/prettyPhoto.css
	css/pricing-table.css
	css/revolution-slider/.DS_Store
	css/revolution-slider/css/.DS_Store
	css/spectrum.css
	css/style.css
	css/superfish.css
	css/switcher.css
	css/team-member.css
	css/theme-responsive.css
	done-pages.txt
	faq-two.html
	faq.html
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	full-width-two.html
	full-width.html
	icons.html
	images/bottom-footer-bg.jpg
	images/main-header-bg - Copy.jpg
	images/main-header-bg.jpg
	images/top-bar-bg.jpg
	images/top-footer-bg.jpg
	img/.DS_Store
	img/about-2.jpg
	img/about.jpg
	img/ads-small.jpg
	img/backgrounds/6.jpg
	img/backgrounds/7.jpg
	img/bg-black.png
	img/bg_off.png
	img/blog/.DS_Store
	img/blog/01.jpg
	img/blog/02.jpg
	img/blog/03.jpg
	img/blog/04.jpg
	img/blog/blog-post1.jpg
	img/blog/blog-post2.jpg
	img/blog/blog-post3.jpg
	img/blog/blog-post4.jpg
	img/blog/blog-post5.jpg
	img/blog/logo.png
	img/check.png
	img/clientslogo/.DS_Store
	img/clientslogo/01.png
	img/clientslogo/02.png
	img/clientslogo/03.png
	img/clientslogo/04.png
	img/clientslogo/intel.png
	img/clientslogo/logo-1.png
	img/clientslogo/logo-2.png
	img/clientslogo/logo-3.png
	img/clientslogo/logo-4.png
	img/clientslogo/logo-5.png
	img/contact-map.png
	img/doublearrow2.png
	img/fifo-small.jpg
	img/gallery/img1.jpg
	img/gallery/img2.jpg
	img/gallery/img3.jpg
	img/gallery/img4.jpg
	img/glow.png
	img/glyphicons-halflings-white.png
	img/glyphicons-halflings.png
	img/greyline.png
	img/ico/.DS_Store
	img/ico/apple-touch-icon-114.png
	img/ico/apple-touch-icon-144.png
	img/ico/apple-touch-icon-57.png
	img/ico/apple-touch-icon-72.png
	img/ico/apple-touch-icon.png
	img/ico/favicon.ico
	img/icons/corporate-solutions.png
	img/icons/email-marketing.png
	img/icons/web-design.png
	img/img-bg-blur.jpg
	img/img-blur-lead2.jpg
	img/iphone5c.png
	img/loader.gif
	img/logo-demo.png
	img/pattern-3.png
	img/pattern.jpg
	img/pattern.png
	img/patterns/.DS_Store
	img/patterns/dark_wood.png
	img/patterns/debut_dark.png
	img/patterns/denim.png
	img/patterns/fabrics_gray.png
	img/patterns/grey_wash.png
	img/patterns/lghtmesh.png
	img/patterns/padded.png
	img/patterns/retina_wood.png
	img/patterns/roughcloth.png
	img/patterns/subtle_grunge.png
	img/patterns/textured_paper.png
	img/patterns/tileable_wood.png
	img/patterns/wall.png
	img/patterns/whitey.png
	img/placeholder-img.jpg
	img/portfolio/.DS_Store
	img/portfolio/01.jpg
	img/portfolio/02.jpg
	img/portfolio/03.jpg
	img/portfolio/04.jpg
	img/portfolio/05.jpg
	img/portfolio/06.jpg
	img/portfolio/portfolio-1.jpg
	img/portfolio/portfolio-10.jpg
	img/portfolio/portfolio-11.jpg
	img/portfolio/portfolio-12.jpg
	img/portfolio/portfolio-2.jpg
	img/portfolio/portfolio-3.jpg
	img/portfolio/portfolio-4.jpg
	img/portfolio/portfolio-5.jpg
	img/portfolio/portfolio-6.jpg
	img/portfolio/portfolio-7.jpg
	img/portfolio/portfolio-8.jpg
	img/portfolio/portfolio-9.jpg
	img/portfolio/single-portfolio-image.jpg
	img/portfolio/thumbs/slider-bg-1.jpg
	img/portfolio/thumbs/slider-bg-2.jpg
	img/portfolio/thumbs/slider-bg-3.jpg
	img/portfolio/thumbs/slider-bg-5.jpg
	img/prettyPhoto/dark_rounded/btnNext.png
	img/prettyPhoto/dark_rounded/btnPrevious.png
	img/prettyPhoto/dark_rounded/contentPattern.png
	img/prettyPhoto/dark_rounded/default_thumbnail.gif
	img/prettyPhoto/dark_rounded/loader.gif
	img/prettyPhoto/dark_rounded/sprite.png
	img/prettyPhoto/dark_square/btnNext.png
	img/prettyPhoto/dark_square/btnPrevious.png
	img/prettyPhoto/dark_square/contentPattern.png
	img/prettyPhoto/dark_square/default_thumbnail.gif
	img/prettyPhoto/dark_square/loader.gif
	img/prettyPhoto/dark_square/sprite.png
	img/prettyPhoto/default/default_thumb.png
	img/prettyPhoto/default/loader.gif
	img/prettyPhoto/default/sprite.png
	img/prettyPhoto/default/sprite_next.png
	img/prettyPhoto/default/sprite_prev.png
	img/prettyPhoto/default/sprite_x.png
	img/prettyPhoto/default/sprite_y.png
	img/prettyPhoto/facebook/btnNext.png
	img/prettyPhoto/facebook/btnPrevious.png
	img/prettyPhoto/facebook/contentPatternBottom.png
	img/prettyPhoto/facebook/contentPatternLeft.png
	img/prettyPhoto/facebook/contentPatternRight.png
	img/prettyPhoto/facebook/contentPatternTop.png
	img/prettyPhoto/facebook/default_thumbnail.gif
	img/prettyPhoto/facebook/loader.gif
	img/prettyPhoto/facebook/sprite.png
	img/prettyPhoto/light_rounded/btnNext.png
	img/prettyPhoto/light_rounded/btnPrevious.png
	img/prettyPhoto/light_rounded/default_thumbnail.gif
	img/prettyPhoto/light_rounded/loader.gif
	img/prettyPhoto/light_rounded/sprite.png
	img/prettyPhoto/light_square/btnNext.png
	img/prettyPhoto/light_square/btnPrevious.png
	img/prettyPhoto/light_square/default_thumbnail.gif
	img/prettyPhoto/light_square/loader.gif
	img/prettyPhoto/light_square/sprite.png
	img/px1.jpg
	img/recent-post-img.jpg
	img/redbg.jpg
	img/redbg.png
	img/redbg_big.png
	img/search-icon.png
	img/slider/.DS_Store
	img/slider/img1.jpg
	img/slider/img2.jpg
	img/slider/nivo_slider1.jpg
	img/slider/nivo_slider3.jpg
	img/slider/nivo_slider4.jpg
	img/slider/responsive-imac.png
	img/slider/responsive-ipad.png
	img/slider/responsive-iphone.png
	img/slider/slider-bg-1.jpg
	img/slider/slider-bg-2.jpg
	img/slider/slider-bg-3.jpg
	img/slider/slider-bg-5.jpg
	img/slider/slider-bg-6.jpg
	img/slider/slider-bg-7.jpg
	img/team-member-2.jpg
	img/team/team-member-1.jpg
	img/team/team-member-2.jpg
	img/team/team-member-3.jpg
	img/team/team-member-4.jpg
	img/team/team.jpg
	img/testimonial/team-member-1.jpg
	img/testimonial/team-member-2.jpg
	img/testimonial/team-member-3.jpg
	img/woman1.png
	index-1.html
	index-2-old.html
	index-2.html
	index-3.html
	index-4.html
	index-nivo.html
	index.html
	js/.DS_Store
	js/bootstrap.js
	js/bootstrap.min.js
	js/circularnav.js
	js/coming-soon.js
	js/custom.js
	js/imagesloaded.pkgd.min.js
	js/jflickrfeed.js
	js/jquery.backstretch.min.js
	js/jquery.cookie.js
	js/jquery.countdow2n.js
	js/jquery.countdown.js
	js/jquery.easing.1.3.js
	js/jquery.gmap.min.js
	js/jquery.isotope.js
	js/jquery.knob.js
	js/jquery.nivo.slider.pack.js
	js/jquery.prettyPhoto.js
	js/jquery.sticky.js
	js/jquery.wait.js
	js/modernizr-2.6.2.min.js
	js/modernizr.custom.04022.js
	js/portfolio.js
	js/respond.min.js
	js/revolution-slider/.DS_Store
	js/revolution-slider/pluginsources/jquery.themepunch.plugins.min.js
	js/revolution-slider/pluginsources/jquery.themepunch.revolution.js
	js/revolution-slider/settings.css
	js/revolution-slider/videojs/demo.captions.vtt
	js/revolution-slider/videojs/font/vjs.eot
	js/revolution-slider/videojs/font/vjs.svg
	js/revolution-slider/videojs/font/vjs.ttf
	js/revolution-slider/videojs/font/vjs.woff
	js/revolution-slider/videojs/video-js.min.css
	js/revolution-slider/videojs/video-js.png
	js/revolution-slider/videojs/video-js.swf
	js/revolution-slider/videojs/video.js
	js/spectrum.js
	js/superfish.js
	js/switcher.js
	js/tweetMachine.js
	js/tytabs.js
	js/waypoints.min.js
	page-404.html
	page-coming-soon.html
	page-left-navigation.html
	page-left-sidebar.html
	page-login.html
	page-right-navigation.html
	page-right-sidebar.html
	portfolio-four.html
	portfolio-full-width.html
	portfolio-three.html
	portfolio-two.html
	services-two.html
	services.html
	shortcodes.html
	sitemap.html
	testimonials.html
slogan fix
menu updated
Merge branch 'master' of https://github.com/mehediworld/gallaxy-mehedi
menu updated
Conflicts:
	index-1.html
menu fixed
added pattern overlay in slogan section
remove some files
faq and service page changed
added three new file
blog small deleted
menu changed
Merge branch 'master' of https://github.com/mehediworld/gallaxy-mehedi
from mehedi
fixing bugs
bugs fixed