commit to allow updates
commit to fix conflict before pulling eric's files
Merge branch 'master' of https://github.com/josiahbgrace/DrinkTracker

Want to update to Eric's files, which are the most recent.
fixed MainActivity, trying to solve merge conflict with Eric