add Access-Control-Allow-Origin for testing
'
add Access-Control-Allow-Origin for testing
'
Merge branch 'master' of heroku.com:raredio

Conflicts:
	config/application.rb