edited, added currentMessageNum variable
Merge remote-tracking branch 'origin/master'

Conflicts:
	hw2.c