started new color scheme
Merge branch 'master' into userlist
Merge pull request #38 from bryansills/master

Add functionality to add songs from musiclibrary to playlist
refactored UserList, created UserColors, created Users
Merge branch 'master' into userlist

Conflicts:
	fanClub/src/com/lastcrusade/fanclub/components/PlaylistFragment.java
	fanClub/src/com/lastcrusade/fanclub/util/MusicListAdapter.java
finished adding in the userlist - found the bug that causes the colors to constantly change
add method to get name of bluetooth adapter
better variable names
added in macAddress to Users
Merge pull request #40 from reidbaker/get_bluetooth_mac

add method to get name of bluetooth adapter
finished refactoring userlist, added in serialization test
fixed LibraryMessageTest
Merge branch 'master' into userlist

Conflicts:
	fanClub/src/com/lastcrusade/fanclub/util/BluetoothUtils.java
fixed code review formatting things
Merge pull request #42 from ejohnson44/userlist

Userlist