add modernizer
Merge remote-tracking branch 'upstream/master'
	modified:   app/assets/javascripts/application.js
	deleted:    app/assets/javascripts/modernizr.custom.js
	modified:   app/assets/stylesheets/component.css
	modified:   app/views/layouts/application.html.erb
	modified:   app/views/welcome/index.html.erb
	new file:   vendor/assets/javascripts/modernizr.js