Add javascript and css for natural language form
add javascript and routes for natural language
add js and routes for natural language
updated styling and form
Merge branch 'master' into natural_language_form

Conflicts:
	app/controllers/main_controller.rb
	app/views/_footer.html.erb
	app/views/main/index.html.erb
	app/views/main/questions_1.html.erb
	app/views/main/questions_2.html.erb
	vendor/assets/stylesheets/naturallanguagecomponent.css
Merge branch 'master' into natural_language_form
merged fixed heroku issue
updated gemfile
Merge branch 'natural_language_form'
last minute styling