Added rails.
Merge branch 'master' of github.com:floatingpointio/erste

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock