need to fix weekend
Merge branch 'master' of https://github.com/Muhlenberg/Berg-Dining-Android