for pull
Merge branch 'master' of https://github.com/ytbeom/assn2

Conflicts:
	CGASSN2/firepot.cpp
final

perfect...