products added
products added
Merge branch 'master' of https://github.com/Heulwen/rails-demo-site

Conflicts:
	app/views/layouts/application.html.erb
	app/views/loanapps/_confirm_step.html.erb
conflicts resolved
Merge branch 'master' of https://github.com/Heulwen/rails-demo-site

Conflicts:
	app/views/products/advanced.html.erb
	app/views/products/basic.html.erb
	app/views/products/index.html.erb
	app/views/products/standard.html.erb