making progess on moveSubtotal
add deleteSubtotal functionality
fix merge conflict in diner view
fix merge conflicts
Merge pull request #39 from KimpossibleG/update_regex

Update regex