small changes
Merge branch 'yerihyo' of github.com:yerihyo/cs6200f13 into yerihyo

Conflicts:
	project02/src/lib.pyc