Setup initial rails application
Merge branch 'master' of https://github.com/wizbanicus/kb

Conflicts:
	.gitignore