modified:   Play.java
	modified:   README.txt
	modified:   RemoteGUI.java
	modified:   change.log
	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
	Avatar.jpginfo
	img/playbutton.png
	img/playing.png
	img/stop.png
Merge branch 'master' of https://github.com/cameronfabbri/Linux-Media-Library-Remote

Conflicts:
	Play.java
	RemoteGUI.java
	org/oscar/cryptobionic/Play$MyUserInfo.class
	org/oscar/cryptobionic/Play.class
	org/oscar/cryptobionic/RemoteGUI$1.class
	org/oscar/cryptobionic/RemoteGUI$2.class
	org/oscar/cryptobionic/RemoteGUI.class