correcting the number of border marks
Attemping to resolve changed {} formatting with marker drawing changes.

Merge branch 'master' of github.com:ncoop/cs56-jupi

Conflicts:
	jupi/CaromTable.java