Updated scripts to find relaxed quad settings
Updated GUI
Merge branch 'master' of github.com:joelfrederico/FACET_Emittance

Conflicts:
	ButterflyGUI/ButterflyGUI.py