devise stuff? May need to throw this out later
Devise stuff
Revert "devise stuff? May need to throw this out later"

This reverts commit 693abb0d26d68811f1ab54c1d77b1d5598830ea2.
Merge branch 'master' of https://github.com/Manifold0/peoples-consultants2

Conflicts:
	people/app/views/devise/registrations/new.html.erb