reg
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/Login.jsp
	JNUSocialNetwork/WebContent/pages/regAndLogin.jsp
commit
bell
custom.css
commit