I dont even know what this is
Merge branch 'master' of https://github.com/josiahbgrace/DrinkTracker