Rails and Gems updated
Merge branch 'master' of github.com:zumbrunnen/betastore

Conflicts:
	.ruby-version