modified jasmine tests
added primitive functionality for adding categories, doesn't style properly or link to anything
adjust expense
added Gruntfile.js
merging
fixed conflicts