Merge branch 'master' into marty
Merge branch 'master' into Adam-Jones
Working on adding product families to products pager
Merge branch 'marty'
Merge branch 'master' into marty
new logout workflow along with new radio button anim
Merge branch 'Adam-Jones'

Conflicts:
	main.wire
Merge branch 'master' into Adam-Jones
had a conflict that I didn't fix I guess
Merge branch 'Adam-Jones'
Merge branch 'master' into Adam-Jones
finished product category displays
Merge branch 'marty'
added stepped bubbles for the sections
Merge branch 'Adam-Jones'
Merge branch 'Dustin'
Merge branch 'master' into Dustin