Updated Globals
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Board.java
	src/Globals.java
	src/Main.java