change made Aug 13
Merge branch 'Only-keep-Two-functions' of https://github.com/vincentywang/synaptop-login-plugin into Only-keep-Two-functions

Conflicts:
	synaptop-login-plugin.php