add cancan
Merge branch 'feature/profiles' of ssh://personal/codeflash/codeflash into feature/profiles

Conflicts:
	Gemfile.lock