bleh
Merge branch 'master' of github.com:sgtpepper43/school-work

Conflicts:
	CS236/TestFile1
Merge branch 'master' of github.com:sgtpepper43/school-work

Conflicts:
	CS236/TestFile1
All but queries done