removed stuff
Merge branch 'master' of github.com:KMarshland/MusicSync
merge
Conflicts:
	gmusicapi.log
	oauth.cred
Merge branch 'master' of github.com:KMarshland/MusicSync