initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assignment 2/CS161Assignment2.odt
	Assignment 2/fireLaw.cpp
	Assignment 2/guess.cpp