changed txt file hehe
Merge branch 'mike'
Merge branch 'master' of github.com:cyntzhou/final
hi
Update README.md
Merge branch 'mike'
Merge branch 'mike' into cynthia

Conflicts:
	text.txt
removed test files
Merge branch 'master' of https://github.com/cyntzhou/final
how to merge
deleted the last_logged_in stuff, and working on schedule