 			# Styles
 			styles: [
 				"http://yui.yahooapis.com/pure/0.5.0/pure-min.css"
-<<<<<<< HEAD
-=======
         "//fonts.googleapis.com/css?family=Lato|Averia+Sans+Libre:300normal,300italic,400normal,400italic,700normal,700italic|Amatic+SC:400normal|Belleza:400normal|Belgrano:400normal|Open+Sans:400normal|Dosis:400normal|Codystar:400normal|Concert+One:400normal|Oswald:400normal|Economica:400normal|Duru+Sans:400normal&amp;subset=all"
->>>>>>> added first cut of layout and build process for new website with an improved structure
 				"/styles/style.css"
 			]
 
 			# Scripts
-<<<<<<< HEAD
-			scripts: []
-
-=======
 			scripts: [
         "/scripts/toggle_menu.js"
         "/scripts/google_analytics.js"
       ]
->>>>>>> added first cut of layout and build process for new website with an improved structure
 
 
 		# -----------------------------

		# Specify some site properties
		site:
			# The production url of our website
<<<<<<< HEAD
			url: "http://website.com"

			# Here are some old site urls that you would like to redirect from
			oldUrls: [
				'www.website.com',
				'website.herokuapp.com'
			]

			# The default title of our website
			title: "Your Website"

			# The website description (for SEO)
			description: """
				When your website appears in search results in say Google, the text here will be shown underneath your website's title.
=======
			url: "http://www.mock-server.com"

			# Here are some old site urls that you would like to redirect from

			# The website description (for SEO)
			description: """
				An API to easily mock any system or service you integrate with via HTTP or HTTPS from either Java or JavaScript.
				"""

			# The website keywords (for SEO) separated by commas
			keywords: """
				mockserver, mock server, mock http server, http mock server, mock-server, mock rest service, mock server java, mock api, java mock http server, server mock, java mock server, mock rest server, java mock web service, api mock, mock web service java, mock web server, mock service, mock rest api, mock http response, mock http server java, mock api server, json mock service, api mocking
				"""

			# The website author's name
			author: "James D Bloom"

			# The website author's email
			email: "your@email.com"
