rewritting
Merge branch 'master' of https://github.com/funkydrummer/profile_url

Conflicts:
	.gitignore
	Gemfile
	Rakefile
	profile_url.gemspec
	spec/profile_url_spec.rb
	spec/spec_helper.rb