changes from home
Merge branch 'master' of https://github.com/JoelLongRoad/Coursework-Interfaces

Conflicts:
	__pycache__/radio_button_dialog_class.cpython-34.pyc