added users controller @transfer
Added Make payment functionality
Fixed merge conflicts without fucking up hopefully