flagviewer
Merge branch 'master' of https://github.com/kenrhe/FlagViewer

Conflicts:
	src/FlagViewer.java