Lab 1 complete
Merge remote-tracking branch 'origin/master'

Conflicts:
	CPSC121/Lab1/Problem1.cpp
Merge remote-tracking branch 'origin/master'

Conflicts:
	CPSC121/Lab1/Problem1.cpp