um something?
Merge branch 'master' of https://github.com/TexasAsir/cs490-Visual-Debugger

Conflicts:
	functions.cpp