syncing
Merge branch 'master' of https://github.com/sebringj/wcpm

Conflicts:
	assets/webready/Curved-Wooden-Backdrops.jpg
	assets/webready/WCPM_logo.png
	assets/webready/banner_bottom_left.png
	assets/webready/banner_bottom_right.png
	assets/webready/cows_contactus_bg.jpg
	assets/webready/facebook_footer_icon.png
	assets/webready/flourish.png
	assets/webready/google_footer_icon.png
	assets/webready/hero_image1.jpg
	assets/webready/line_flourish.png
	assets/webready/our_partners.png
	assets/webready/products_icon.png
	assets/webready/restaurants_icon.png
	assets/webready/team_icon.png
	assets/webready/twitter_footer_icon.png
	assets/webready/wcpm_footer_logo.png
	assets/webready/wcpm_large_watermark.png
	images/Curved-Wooden-Backdrops.jpg
	images/WCPM_logo.png
	images/banner_bottom_left.png
	images/banner_bottom_right.png
	images/cows_contactus_bg.jpg
	images/facebook_footer_icon.png
	images/flourish.png
	images/google_footer_icon.png
	images/hero_image1.jpg
	images/line_flourish.png
	images/our_partners.png
	images/products_icon.png
	images/restaurants_icon.png
	images/team_icon.png
	images/twitter_footer_icon.png
	images/wcpm_footer_logo.png
	images/wcpm_large_watermark.png
	untitled folder/Curved-Wooden-Backdrops.jpg
	untitled folder/WCPM_logo.png
	untitled folder/banner_bottom_left.png
	untitled folder/banner_bottom_right.png
	untitled folder/cows_contactus_bg.jpg
	untitled folder/facebook_footer_icon.png
	untitled folder/flourish.png
	untitled folder/google_footer_icon.png
	untitled folder/hero_image1.jpg
	untitled folder/line_flourish.png
	untitled folder/our_partners.png
	untitled folder/products_icon.png
	untitled folder/restaurants_icon.png
	untitled folder/team_icon.png
	untitled folder/twitter_footer_icon.png
	untitled folder/wcpm_footer_logo.png
	untitled folder/wcpm_large_watermark.png
Merge branch 'master' of https://github.com/sebringj/wcpm