origin pull master

Gemfile

@@ -10,7 +10,13 @@ end
 gem 'rails', '~> 5.1.0'
 # Use mysql as the database for Active Record
 gem 'mysql2', '>= 0.3.18', '< 0.5'
-#gem 'pg'
+
+#Use PosgreSQL
+gem 'pg'
+
+# redis server for cable
+# gem 'redis', '~> 3.0'
+
 # Use Puma as the app server
 gem 'puma', '~> 3.0'
 # Use SCSS for stylesheets
@@ -37,6 +43,8 @@ gem 'to_xls-rails'
 #Reporting gem
 #gem 'compendium'
 
+# Pagination
+gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'