added rails
Merge branch 'master' of github.com:Jylhis/GetBeer

Conflicts:
	.gitignore