ajax needs fixing
ajax fixed to output json
ajax json needs fixing
showing new currency in the browser with ajax
merge conflict resolution
merge bug fix
recievedtext_controller removed
rspec tests now pass
uniform naming convetion
Merge branch 'ajax-response' into develop

Conflicts:
	app/controllers/exchanges_controller.rb
	app/views/welcome/index.html.erb
	spec/controllers/exchanges_controller_spec.rb
working exchange rate convertions with api