Merge pull request #12 from RomeshPanditha/master

Merge back into personal fork
Changes to Shopping and minor changes to Bills
fixed rubbish