Merge branch 'master' of https://github.com/101companies/101rails into playground
updated gems, puma config
Merge branch 'master' of https://github.com/101companies/101rails into playground

Conflicts:
	app/models/page.rb