Bogus
Merge branch 'master' of git://github.com/woodbury/Musha
Notifications page in progress
Button for toggling between friends/all users added
Merge branch 'master' of https://github.com/woodbury/Musha
playlist stuff works- multi window problem needs fixing
playlist stuff works- multi window problem needs fixing
Search works!!
I had broken playlists, now they work. Search works too.
Friends panel now switches between your friends and people who aren't your friends. You can send friend requests and view other user's libraries as well. I need to do some error checking with sending friend requests, duplicate requests, but it is working well.
Merge branch 'master' of https://github.com/woodbury/Musha

Conflicts:
	src/ui/MainPage.java
	src/ui/MainTableModel.java
Fixed a merge gone bad!
Have the bottom button load differently depending on whether you are viewing your library or viewing a friend's library.
Bad refresh function, notifications in progress
Logging out and logging back in is working now
fixed accept friend request error checking