DS_store
Merge pull request #4 from hjhartung/master

merge master to dev
pulled from master
session model edits
made suggested changes to session model
Merge pull request #7 from cmimi/master

session model edits
Merge pull request #9 from deliaz1993/master

deleted irrelevant models and views (customers and item_splits)
Revert "deleted irrelevant models and views (customers and item_splits)"
Merge pull request #10 from hjhartung/revert-9-master

Revert "deleted irrelevant models and views (customers and item_splits)"
Merge branch 'master' of github.com:hjhartung/AlDente
Merge pull request #11 from deliaz1993/master

deleted all customers and item_splits leftovers
removed customers and item_splits. added tax_percentage column to items table
Merge branch 'master' of github.com:hjhartung/AlDente
Merge pull request #12 from hjhartung/master

update to master
Merge branch 'dev' of github.com:hjhartung/AlDente
Merge pull request #13 from hjhartung/dev

removed customers and item_splits, added tax_percentage to items
fixed merge conflict