Merge branch 'master' of https://github.com/sevaghanssian/musiclounge

Conflicts:
	src/LoginPan.java
	src/MainPan.java
	src/MusicLoungeGUI.java
Merge branch 'master' of https://github.com/sevaghanssian/musiclounge