Merge pull request #6 from KShaw29/timsBranch

Tims branch
Merge pull request #7 from KShaw29/testMerge

Test merge
Ryans commit. Added liquor listview
Merge pull request #8 from KShaw29/ryansList

Ryans commit. Added liquor listview
Threw in the calc
Did the Calculator