commit
all three expense models workinggit add .
code tidied up...still ugly
merge conflicts resolved
Merge branch 'master' of https://github.com/thebkbuffalo/travel_breakdown_app
fixing merge issues/lame attempt at rails calendar