working on sales
last commit was messed up
SALES ARE WORKING. WIN
Merge branch 'master' of github.com:katiespiders/far_mar_rails
Aaah, I'm stuck in vim! We have to merge because how else is this supposed to work?