Updates

It’s should be working almost
Merge branch

Conflicts:
	src/Grid.java
	src/Pentomino.java
Merge branch 'master' of https://github.com/Project-1-Group-7/Project1.1

Conflicts:
	src/Grid.java
	src/Pentomino.java