Merge branch 'master' into landing-page
tested and working landing page
added open_exchange_rates_provide
public/index file removed
initial tests on OpenExchangeRates passing
controller generated
Merge branch 'master' into develop
merge develop into exchange_controller
finish api testing
exchange model
Merge branch 'landing-page' into develop

Conflicts:
	config/routes.rb
added forms amount, from and to
Merge branch 'develop' into landing-page

Conflicts:
	config/routes.rb
Merge remote-tracking branch 'origin/develop' into develop again
exchange controller ready for qa
postgres passwords removed
merge
Merge remote-tracking branch 'origin/exchange_controller' into exchange-converter
begin exchange tests
Merge branch 'openexchangerates_api_learning' into exchange-converter