add articles_controller, change page_controller to pages
ch page_controller to pages_controller
rm public/index.html
Merge branch 'feature/upgrade_rails1_to_2' of github.com:NZX/recon-upgrade into feature/upgrade_rails1_to_2
add .gitingore
rm dev.log