set default parameters in Procfile
Update README.md
Update README.md
Update README.md
update config settings
Merge branch 'master' of https://github.com/Cominch/lsi-rails-prototype
Merge branch 'master' of https://github.com/Cominch/lsi-rails-prototype

Conflicts:
	README.md
	config/environments/production.rb
	config/initializers/x_customization.rb
Update README.md
config var fix
Merge branch 'master' of https://github.com/Cominch/lsi-rails-prototype
Merge branch 'master' of https://github.com/Cominch/lsi-rails-prototype

Conflicts:
	README.md