Merge branch 'master' into Janet
Merge branch 'master' into Janet
added progress bar
progress bar images tethered to game time
made mainThread a global variable
added progress bar and functionality

Conflicts:
	AP Project 4/src/object/Board.java
progress images tethered to time

progress images associated with time elapsed, not score