added my hello message
added the second time
Trying a third time
Merge branch 'master' of github.com:elsaturnino/comp280-fa14-week4

Conflicts:
	checkin.c
added
added
added