added hayleys file for the gamestate
updated class diagram
added m3 documents
Added update board test
Added another update board test
resolving conflicts in PokemonGridTests
fixed some other merging issues