modified:   Assignment2.py
	#homoNotesIsText.png
new file:   homoNotesIsText.png
Merge branch 'master' of github.com:Bladtman242/sigb2013.2

Conflicts:
	Assignment2.py

modified:   .gitignore
modified:   Assignment2.py