got basic page layout scaffold so on styling
got base uploader for carrierwave and nested resources need to move onto amazone s3
got amazon s3 working
fixing merge conflict