Merge branch 'master' of https://github.com/JamesSullivan1/CPSC219_Team13_Project

Conflicts:
	src/main/Board.java
Merge branch 'master' of https://github.com/JamesSullivan1/CPSC219_Team13_Project

Conflicts:
	src/main/Board.java