dont pay attention to this one
Merge branch 'master' of https://github.com/nebomusic/375Fall14Team3
changed getServed for the 444444444444444th time