merge

Gemfile

Gemfile.lock

app/assets/images/cc.png

app/assets/images/decrease_font.ico

app/assets/images/increase_font.ico

app/assets/images/iros.jpg

app/assets/images/logo.png

app/assets/images/mecshow_logo.jpg

app/assets/javascripts/application.js

app/assets/stylesheets/application.css

app/assets/stylesheets/application.css.scss

app/assets/stylesheets/application/welcome.scss

app/controllers/welcome_controller.rb

app/views/layouts/application.html.erb

app/views/shared/application/_footer.html.erb

app/views/shared/application/_header.html.erb

app/views/welcome/complaint.html.erb

app/views/welcome/contact.html.erb

app/views/welcome/faq.html.erb

app/views/welcome/index.html.erb