crossdomain
Merge branch 'master' of github.com:aleqi200/top-ten-api

Conflicts:
	app/controllers/application_controller.rb