Created static_pages controller, created welcome view
Fixed merge conflict in application.js file