Deal with conflicts.
Fix merge.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Yelp_KMeans/CoffeeShops/src/app/CoffeeShopTrendFinder.java