- generated a pages controller
- created 'pages' folder inder app/views
- created 'home.html.erb' and 'about.html.erb' inside views/pages folder
- modified routes.rb file to point to home page, and point to about page
Merge branch 'master' into samDev
added pages routes for host to access
resolved routes.rb conflict
resolved routes.rb conflict
updated routes.rb for static pages (after pull requests)
resolved conflicts with pages, routes and pages css file