change getters and setters
Merge branch 'master' of https://github.com/megu5202/iDrink
hooking shit up
add file changes
test