generic
Merge branch 'master' of https://github.com/ungawatkt/Comp-15

Conflicts:
	proj_1/test_case