Merge branch 'master' into landing-page
tested and working landing page
public/index file removed
added forms amount, from and to
Merge branch 'develop' into landing-page

Conflicts:
	config/routes.rb