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

Conflicts:
	JNUSocialNetwork/WebContent/pages/js/jquery.localscroll-1.2.7-min.js
	JNUSocialNetwork/WebContent/pages/js/jquery.scrollTo-1.4.2-min.js