brian's fix to agreement.py for the 500 error from /json
Merge branch 'master' of github.com:batcave/trashboard
tweaked colors
Merge branch 'master' of github.com:batcave/trashboard
Fixed the display of the package customization
Finished the navbar
Merge branch 'facelift/lifted'
product contents come from pricetables now.
Merge branch 'master' of github.com:batcave/trashboard
removed S state from constants.js, added the video plus thing but haven't added the items it refers to
Merge branch 'master' of github.com:batcave/trashboard
added the videoplus item to every price table in fixtures.py and made the promo look for CAMERA instead
added owner, working, and created_by users to the agreement model
moving handy up
Merge branch 'master' of github.com:batcave/trashboard