hi
Merge branch 'mike' of github.com:cyntzhou/final into mike
Merge branch 'mike' into cynthia

Conflicts:
	text.txt
how to merge
deleted the last_logged_in stuff, and working on schedule