Working on changing Water to work. Added memoization cool stuff
Merge branch 'generic' of https://github.com/ajgajg1134/243Lab2 into generic

Conflicts:
	243Project2/src/Water.java