modified:   compare.py
	deleted:    __init__.pyc
	new file:   ../.gitignore
Merge remote-tracking branch 'origin/master'