adding in changes that were taken out during last merge
Merge branch 'master' of https://github.com/cojoigo/weTunes
Joe put up a file before I commited, thanks Joe