Added two more tests for FloodGenerator.getEdges()
Merge branch 'master' of https://github.com/ZimonD/ContextCG7
Small fix in Sprint Retrospect #3.

The 16 water sprites are already done by me, so it's included in the Retrospect.
This version is the final version as it is handed in.