not working, method setup for adding to queue and playing
Merge branch 'master' into play_things_from_queue
logging and xml change
clean up
started new color scheme
Merge branch 'master' into userlist
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
This wasnt a pure merge
Merge branch 'master' into play_things_from_queue

Conflicts:
	fanClub/res/layout/content_frame.xml
	fanClub/src/com/lastcrusade/fanclub/components/MusicLibraryFragment.java
	fanClub/src/com/lastcrusade/fanclub/service/PlaylistService.java
Merge pull request #40 from reidbaker/get_bluetooth_mac

add method to get name of bluetooth adapter
play image changes when pressed
buttons were backwards
song plays with updated button
button resets after song is finished
add ability to move through the queue