commit to merge
Merge remote-tracking branch 'origin/ejaj'
purchase edit and list
purchase show
conflict with master resolved