RoR devise, cancan, bootstrap, template, comments, slim
Merge branch 'master' of https://github.com/custanator/ruby_on_rails

Conflicts:
	.gitignore
init