Caboodle dolled up
Merge branch 'master' of https://github.com/sethgarrison/LENS-SANDBOX

Conflicts:
	app/views/caboodle.html
	app/views/templates/caboodle.html