tabs still need work
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/caboodle.html
tabs done, change color to match active page bg color