Adding user functionality
Merge branch 'users'

Conflicts:
	divelog/Gemfile.lock