nolan's local changes
Merge branch 'master' of https://github.com/zrisher/exceptional_supplies
cleaned up css, added todo lists