cleaned up existing greetings
Merge branch 'master' of github.com:elsaturnino/comp280-fa14-week4

Conflicts:
	checkin.c