Added Devise
Merge branch 'master' of github.com:zhbanton/photo_mixer

Conflicts:
	Gemfile.lock