updated from main branch
Merge remote-tracking branch 'upstream/master'
added a basic playlist view and got the song information displaying
messing with some more layout things
gave up on vertical text, moved to colored bars
switched to colors
Merge remote-tracking branch 'upstream/master'

Conflicts:
	fanClub/res/values/strings.xml
	fanClub/src/com/lastcrusade/fanclub/HostActivity.java
	fanClub/src/com/lastcrusade/fanclub/model/Song.java
New launcher icons in, playlist layout created - works with hardcoded users and songs for testing
fixed spacing problems
Merge pull request #19 from ejohnson44/master

Setup layout of playlist activity with individual song views