added music-app-rdio/my_modules/rdio_consumer_credentials.js to gitignore
Merge branch 'force_test'

Conflicts:
	music-app-rdio/my_modules/rdio_consumer_credentials.js