Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   RemoteGUI.java
	modified:   org/oscar/cryptobionic/Play$MyUserInfo.class
	modified:   org/oscar/cryptobionic/Play.class
	modified:   org/oscar/cryptobionic/RemoteGUI$1.class
	modified:   org/oscar/cryptobionic/RemoteGUI$2.class
	modified:   org/oscar/cryptobionic/RemoteGUI.class
Merge branch 'master' of https://github.com/cameronfabbri/Linux-Media-Library-Remote