Merge pull request #1 from joshbarnettlloydGSP420/Team3-Working-branch

testing commit of working branch
added in options class
test commit
Merge pull request #2 from joshbarnettlloydGSP420/Team1-Working-Branch

test commit
New additions

Added empty function and variable manager and took out the test commit
changes
Merge pull request #3 from joshbarnettlloydGSP420/Team1-Working-Branch

Team1 working branch
Merge branch 'Team3-Working-branch'

Conflicts:
	GSP420CourseProject/GSP420CourseProject.sdf
	GSP420CourseProject/GSP420CourseProject.suo