Working on Part @
Merge branch 'master' of https://github.com/edaza/linkit

Conflicts:
	Gemfile.lock
	spec/factories/links.rb
	spec/factories/users.rb
	spec/spec_helper.rb