-
Merge branch 'master' of https://github.com/epwenker/ViewMaster

Conflicts:
	src/com/epwenker/viewMaster/gui/ViewMasterGUI.java