Fixed forms
fixed conflicts
Working on my receipts page
fixed conflicts
working on my reciepts form
fixed changes