adding in css
fixed merge conflict in cashier.js
Merge branch 'master' of https://github.com/jsogarro/fincapdev14
debugging stuff
updated frontend and fixed cashier bug