Users can manually add receipts through web; feed hooked up to backend
fixing merge conflicts