swipe vol.1
fff
Merge remote-tracking branch 'origin/master'

Conflicts:
	windowGUI.java