small changes
Merge origin/master

Conflicts:
	src/truthtablegenerator/GUI.java