rails setup
Merge branch 'master' of github.com:alebruck/question-hub

Conflicts:
	.gitignore