add new order html.erb
Merge branch 'master' of https://github.com/kemccabe/betsy_rails

Conflicts:
	config/routes.rb
merge
fix merge