Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/macalester/comp124/numbers/Numbers.java