Just a commit to pull from Ken
Merge remote-tracking branch 'kenneth/master'
Created the view controller and skeleton code for shortest route calculation.
Trying to fix merge conflict
Merge remote-tracking branch 'kenneth/master'
Fixed merge issue in proj settings
SearchVC:
	Removed things like price87 - 91 in preparation of updating the Businesses and Products. The program will still run but values are set to 0 or N/A.

Details:
	Set prices to N/A and updating prices doesn't work for the time being. Will update to work with new database tables.

Business:
	Removed prices, timeUpdated, and userUpdated members.
	Added listOfProducts -- each business will now have a list of products that keeps track of prices, timeUpdated, and userUpdated
	Added url as the url to the PHP file used to communicate with server. Will use this to populate the list of products. Still in the works.

ShortestPath:
	Just stopped showing the table temporarily so that it won't crash the program as we fiddle with Businesses and Products. Will reenable after those have been fixed.

Product:
	Adding members in preparation for listOfProducts population inside Business class. Will be referring to these variables to display variables inside the Storyboard.
Now search results will show all businesses, not just gas stations! Prices are obtained from products instead of from the business. Cool beans yo. Things left to fix:
1. Make separate view if it is retail vs gas station
2. Fix an issue where the search results is updating twice. This takes too long as well.

Detailed Comments:

SearchVC.swift:
	Took out the setUpBusiness() function. Not used or needed anymore.
	Updated cellForRowAtIndexPath function to set cells to show information about product instead of business.

Business.swift:
	Added dbURL member which keeps track of the PHP file we want to communicate with.
	Fully implemented queryProductsFromDB function. This function is used whenever the last constructor (init) is called.
		it parses JSON and gets product information just like how the businesses worked

Product.swift:
	Added many more member variables which are core to the Products class. These include productID, the businessID (business which the product belongs to), productPrice, timeLastUpdated, and userLastUpdated.
	Updated all constructors to assign default values. Ensures not to mess up kenneth's work in other classes cause that would suck. (gotta stay modular!)
	Created my own constructor to create a product when getting it from the database.
Main.storyboard:
	Modified the cells in SearchVC to show products instead of businesses.

SearchVC:
	Fixed a bug where the resultsTable would be updated twice
	Replaced arrayOfResults with totalListOfProducts
	Added listOfBusinesses
	Set the cellForRowAtIndexPath function to show each product from totalListOfProducts instead of business
	Added a function to append all the products to the totalListOfProducts (used when getting all the businesses)

ResultCell.siwft:
	Added modified version of setCell which is used to set up the cells inside the searchVC (for products now, not business)

Product.swift:
	Added a function called "getBusiness" which will get the find the business a product belongs to.
This time for sure I fixed the location updating 2+ times. No BS.
attempted to recover from location to zip code