Water works now
Merge branch 'populate-db' of https://github.com/aabmass/CIS4301-Project-GUL into populatedb