modifed views.py context_dict
fixed merge conflict
added expense log implementation