initialcommit
Merge branch 'master' of https://github.com/fcolnaghi/rails_devise_bs3_cancan_ajax

Conflicts:
	.gitignore