Merge branch 'master' of /Users/parker/School/11th Grade/Software Dev/sandwiches with conflicts.
Merge remote-tracking branch 'origin/master'
admin method
admin method