need to pull and added back buttons for the teacher
fixed pull errors
Merge branch 'master' of https://github.com/noahpc/WhiteCollar
fixed merge changes
Merge branch 'master' of https://github.com/noahpc/WhiteCollar
need to pull again
fixed pull errors
Javascript moved over for the users among other things
Trying to commit again ...
Merge branch 'master' of http://github.com/noahpc/WhiteCollar
Updated more javascripts
Merge branch 'master' of https://github.com/noahpc/WhiteCollar
Delete markov_encryption.cpython-32.pyc
Delete security.cpython-32.pyc
Merge branch 'master' of https://github.com/noahpc/WhiteCollar
Delete PCC Sales Contacts Master List S13 (ticket builder) - Copy.py
Delete PCC Sales Contacts Master List S13 (note 1).py
Delete Sample.csv
Ignore this ...
Fixed up my receipts pages and added checks for sold or released