Added timer and pedometer to maze screen. Fixed timer bug. Fixed minor
bugs here and there.
Merge remote-tracking branch 'origin/master'

Conflicts:
	MazeEscapeApp/bin/mazeEscapeApp/MazeEscape.class
	MazeEscapeApp/src/mazeEscapeApp/MazeEscape.java