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