favicon + all
favicon + all
Merge branch 'master' of github.com:carpe171/almondleaf

Conflicts:
	app/assets/images/BIOPIC.jpg
	app/assets/images/TREEONLY.jpg
	app/assets/images/about_dr_devreugd.jpg
	app/assets/images/about_photo.jpg
	app/assets/images/about_the_dr.jpg
	app/assets/images/almond-flower.jpg
	app/assets/images/almond-leaf.jpg
	app/assets/images/almond-tree.jpg
	app/assets/images/cracked-leather.jpg
	app/assets/images/drd.jpg
	app/assets/images/drdevreugdlogo.jpg
	app/assets/images/drdevreugdlogo2.jpg
	app/assets/images/email-icon.jpg
	app/assets/images/email-icon2.jpg
	app/assets/images/facebook.gif
	app/assets/images/facebook.jpg
	app/assets/images/front-BIOPIC.jpg
	app/assets/images/leaf-header.jpg
	app/assets/images/new-banner.jpg
	app/assets/images/room2.jpg
	app/assets/images/sign-copy.jpg
	app/assets/images/sign.jpg
	app/assets/images/twitter.gif
	app/assets/images/twitter.jpg
	app/assets/images/vine.jpg
	app/assets/javascripts/custom.js
	app/assets/javascripts/custom.js.coffee
	app/assets/stylesheets/custom.css.scss.erb
	app/assets/stylesheets/flexslider.css.scss.erb.css
	app/views/static_pages/faq.html.erb
	app/views/static_pages/home.html.erb
	app/views/static_pages/location.html.erb
	app/views/static_pages/services.html.erb
	public/assets/BIOPIC-84cec8a2dc45935b5ae10ba866ed7b00.jpg
	public/assets/BIOPIC.jpg
	public/assets/TREEONLY-3b7472adb7e6962c54a963384693a113.jpg
	public/assets/TREEONLY.jpg
	public/assets/about_dr_devreugd-c1fc73f67d177523043e5a09d61324cc.jpg
	public/assets/about_dr_devreugd.jpg
	public/assets/about_photo-f3a9ff2d71754e5489f9d1eb949ba955.jpg
	public/assets/about_photo.jpg
	public/assets/about_the_dr-4962e5ec9a84a3f8a966ee5d00e7bc59.jpg
	public/assets/about_the_dr.jpg
	public/assets/almond-flower-e44cb03fb6acf15404ead187861b779c.jpg
	public/assets/almond-flower.jpg
	public/assets/almond-leaf-1874dfa590c5708b37675922aab8547b.jpg
	public/assets/almond-leaf.jpg
	public/assets/almond-tree-d8d8c2b4d7396e13692c600507545377.jpg
	public/assets/almond-tree.jpg
	public/assets/application.css
	public/assets/application.css.gz
	public/assets/application.js
	public/assets/application.js.gz
	public/assets/cracked-leather-bf7cfba7a57703ec7fc20181ca05d089.jpg
	public/assets/cracked-leather.jpg
	public/assets/drd-d825fab0939c82396c215569c8680167.jpg
	public/assets/drd.jpg
	public/assets/drdevreugdlogo-696b8650f75288675e00c61b12f88bd2.jpg
	public/assets/drdevreugdlogo.jpg
	public/assets/drdevreugdlogo2-774ac927558805e81c4a28a32cd0230f.jpg
	public/assets/drdevreugdlogo2.jpg
	public/assets/email-icon-94d320c69bfff88081d95260a9a4fbf0.jpg
	public/assets/email-icon.jpg
	public/assets/email-icon2-1b71fe6818ada466005b6b43df53de1f.jpg
	public/assets/email-icon2.jpg
	public/assets/facebook-1002efb1d3c7a079366cfb851ab34ee4.jpg
	public/assets/facebook-57fae5a8e6099efcff3b9ade8f08507a.gif
	public/assets/facebook.gif
	public/assets/facebook.jpg
	public/assets/front-BIOPIC-69dc5cb42612c1127edac5b161bbb895.jpg
	public/assets/front-BIOPIC.jpg
	public/assets/leaf-header-43de0b6bace218be653f0be40e655cef.jpg
	public/assets/leaf-header.jpg
	public/assets/manifest.yml
	public/assets/new-banner-18b671ce3d5710f0b01395b098a70520.jpg
	public/assets/new-banner.jpg
	public/assets/room2-7896de18d607bf66c2e51ae793d7c529.jpg
	public/assets/room2.jpg
	public/assets/sign-c7d0def58718e2ee74f7b5a00c5ce731.jpg
	public/assets/sign-copy-3ac2db85f00c25c6a5a45603e44008b3.jpg
	public/assets/sign-copy.jpg
	public/assets/sign.jpg
	public/assets/twitter-4f61bfef30661bfc0d8451e4b164e44a.gif
	public/assets/twitter-6b184122fcc75ecfa72798f2d15ecfae.jpg
	public/assets/twitter.gif
	public/assets/twitter.jpg
	public/assets/vine-0b4d0379100595fac42e3683dc607113.jpg
	public/assets/vine.jpg