Test commit
Merge branch 'master' of https://github.com/jsonntag/genstats.git

Conflicts:
	src/org/genstats/view/LoadingWindow.java