Merge branch 'stcc' of github.com:lmr3796/ntucsie-oop-hw into stcc

Conflicts:
	Gemfile