Fixed email attrib of profiles so it doesn't conflict with devise
Merge branch 'master' of https://github.com/thedevguy/shufffle-web

Conflicts:
	config/initializers/devise.rb