Updated Rails version
Merge branch 'master' of github.com:dsalazar32/iomediums-api

Conflicts:
	.rbenv-version
	Gemfile
	Gemfile.lock