please last login&logout
last please
Merge branch 'master' of https://github.com/wlsgud125/happyhappycon

Conflicts:
	HappyHappyCon/src/com/example/happyhappycon/Login.java
	HappyHappyCon/src/com/example/happyhappycon/Register.java