Initial commit
Initial commit
Merge branch 'master' of https://github.com/ubc-cs310/ThePunishers
Google and Facebook account login and a Thirst picture.
the login stuff part 2
same login junk, attempt 3
changed the layout of the Thirst login page.
Implemented parser and water fountain class
Changes to how a user is stored in a fountain
Merge branch 'dot' into hannahsawesomebranch2
moved parser to server package
Added fountain service stuff
Merge branch 'hannahsawesomebranch2' into dot
Added a bit of implementation
Fixed methods in water fountain class
changed getter methods in WaterFountain, trail implementation of add/removeFaveWaterFountain
fixed a merge conflict in WaterFountain
fixed types and implemented getFavWaterFountains
changed the return type for getFavorites, added WFService servlet to web.xml
added some modified files