20140813
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cobbler1/blog.html
	Cobbler1/contact.html
	Cobbler1/pricing.html
	Cobbler1/testimonials.html