Initial commit of website.# Please enter the commit message for your changes. Lines starting# with '#' will be ignored, and an empty message aborts the commit.## Committer: Pedro Rodriguez <keiga@pedro-MacBookPro.(none)>## On branch master## Initial commit## Changes to be committed:#   (use "git rm --cached <file>..." to unstage)##	new file:   .gitignore#	new file:   Gemfile#	new file:   Gemfile.lock#	new file:   README.rdoc#	new file:   Rakefile#	new file:   app/assets/images/rails.png#	new file:   app/assets/javascripts/application.js#	new file:   app/assets/stylesheets/application.css#	new file:   app/controllers/application_controller.rb#	new file:   app/decorators/controllers/refinery/.gitkeep#	new file:   app/decorators/models/refinery/.gitkeep#	new file:   app/helpers/application_helper.rb#	new file:   app/mailers/.gitkeep#	new file:   app/models/.gitkeep#	new file:   app/views/layouts/application.html.erb#	new file:   app/views/refinery/_content_page.html.erb#	new file:   app/views/refinery/_header.html.erb#	new file:   app/views/refinery/pages/home.html.erb#	new file:   app/views/refinery/pages/show.html.erb#	new file:   app/views/sitemap/index.xml.builder#	new file:   config.ru#	new file:   config/application.rb#	new file:   config/boot.rb#	new file:   config/database.yml#	new file:   config/database.yml.mysql#	new file:   config/database.yml.postgresql#	new file:   config/database.yml.sqlite3#	new file:   config/environment.rb#	new file:   config/environments/development.rb#	new file:   config/environments/production.rb#	new file:   config/environments/test.rb#	new file:   config/initializers/backtrace_silencers.rb#	new file:   config/initializers/inflections.rb#	new file:   config/initializers/mime_types.rb#	new file:   config/initializers/refinery/authentication.rb#	new file:   config/initializers/refinery/core.rb#	new file:   config/initializers/refinery/i18n.rb#	new file:   config/initializers/refinery/images.rb#	new file:   config/initializers/refinery/pages.rb#	new file:   config/initializers/refinery/resources.rb#	new file:   config/initializers/secret_token.rb#	new file:   config/initializers/session_store.rb#	new file:   config/initializers/wrap_parameters.rb#	new file:   config/locales/en.yml#	new file:   config/routes.rb#	new file:   db/migrate/20130213173519_create_refinerycms_authentication_schema.refinery_authentication.rb#	new file:   db/migrate/20130213173520_create_refinerycms_images_schema.refinery_images.rb#	new file:   db/migrate/20130213173521_create_refinerycms_resources_schema.refinery_resources.rb#	new file:   db/migrate/20130213173522_create_refinerycms_pages_schema.refinery_pages.rb#	new file:   db/migrate/20130213173523_create_seo_meta.seo_meta_engine.rb#	new file:   db/schema.rb#	new file:   db/seeds.rb#	new file:   doc/README_FOR_APP#	new file:   lib/assets/.gitkeep#	new file:   lib/tasks/.gitkeep#	new file:   log/.gitkeep#	new file:   public/404.html#	new file:   public/422.html#	new file:   public/500.html#	new file:   public/favicon.ico#	new file:   public/robots.txt#	new file:   script/rails#	new file:   vendor/assets/javascripts/.gitkeep#	new file:   vendor/assets/stylesheets/.gitkeep#	new file:   vendor/plugins/.gitkeep#
Merge branch 'master' of https://github.com/EntilZha/CSUAWebsite