Added GUI
Merge remote-tracking branch 'origin/master'

Conflicts:
	Final_project.m
Merge branch 'master' of https://github.com/tmccall8829/ENGR-131-Final-Project

Conflicts:
	Final_project.m