they are making me commit, not even sure of the changes
Merge branch 'master' of https://github.com/GrinnellAppDev/GrinWell-Android
'Needed to for development to continue'