Merge pull request #1 from lucasallan/readme

Updates README and Gemfile

Gemfile

@@ -1,46 +1,23 @@
 source 'https://rubygems.org'
 
-
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3'
-# Use Puma as the app server
-gem 'puma', '~> 3.0'
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-# Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.2'
-# See https://github.com/rails/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
-
-# Use jquery as the JavaScript library
-gem 'jquery-rails'
-# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-gem 'turbolinks', '~> 5'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.5'
-# Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
-
-# Use Capistrano for deployment
-# gem 'capistrano-rails', group: :development
+gem 'rails',        '~>5.0.0.1'
+gem 'pg',           '~> 0.18.4'
+gem 'puma',         '~> 3.6.0'
+gem 'sass-rails',   '~> 5.0.6'
+gem 'uglifier',     '~> 3.0.2'
+gem 'coffee-rails', '~> 4.2.1'
+gem 'jquery-rails', '~> 4.2.1'
+gem 'turbolinks',   '~> 5.0.1'
+gem 'jbuilder',     '~> 2.6.0'
+gem 'haml',         '~> 4.0.7'
 
 group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platform: :mri
 end
 
 group :development do
-  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
   gem 'web-console'
   gem 'listen', '~> 3.0.5'
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
 end
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

Gemfile.lock

@@ -55,6 +55,8 @@ GEM
     ffi (1.9.14)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
+    haml (4.0.7)
+      tilt
     i18n (0.7.0)
     jbuilder (2.6.0)
       activesupport (>= 3.0.0, < 5.1)
@@ -81,6 +83,7 @@ GEM
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
+    pg (0.18.4)
     pkg-config (1.1.7)
     puma (3.6.0)
     rack (2.0.1)
@@ -131,7 +134,6 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.5)
@@ -156,19 +158,19 @@ PLATFORMS
 
 DEPENDENCIES
   byebug
-  coffee-rails (~> 4.2)
-  jbuilder (~> 2.5)
-  jquery-rails
+  coffee-rails (~> 4.2.1)
+  haml (~> 4.0.7)
+  jbuilder (~> 2.6.0)
+  jquery-rails (~> 4.2.1)
   listen (~> 3.0.5)
-  puma (~> 3.0)
-  rails (~> 5.0.0, >= 5.0.0.1)
-  sass-rails (~> 5.0)
+  pg (~> 0.18.4)
+  puma (~> 3.6.0)
+  rails (~> 5.0.0.1)
+  sass-rails (~> 5.0.6)
   spring
   spring-watcher-listen (~> 2.0.0)
-  sqlite3
-  turbolinks (~> 5)
-  tzinfo-data
-  uglifier (>= 1.3.0)
+  turbolinks (~> 5.0.1)
+  uglifier (~> 3.0.2)
   web-console
 
 BUNDLED WITH

README.md

@@ -1,24 +1,13 @@
-# README
+# Conference talk submission system
 
-This README would normally document whatever steps are necessary to get the
-application up and running.
+## Software stack
 
-Things you may want to cover:
+ActiveCFP is a Ruby on Rails application that runs on the following software:
 
-* Ruby version
+- Ruby (MRI) 2.3
+- Redis 2.8+
+- MySQL or PostgreSQL
 
-* System dependencies
+## License and Copyright
 
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
+*ActiveCFP* is free software released under the [MIT License](http://www.opensource.org/licenses/MIT).