working pathways
Merge branch 'master' of github.com:lemiwinks/activate.me

Conflicts:
	app/models/user.rb