cleaned the css so it doesn't interfere with the css in the main page
cleaned the css so it doesn't interfere with the css in the main page
update
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	style/login-popup.css
inserted logo
Merge remote-tracking branch 'origin/master'

Conflicts:
	login-check.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
inserted logo