With some testing data.
Merge branch 'master' of https://github.com/tlp6191/Quarto

Conflicts:
	Quarto.java