fixed all earth's problems
Merge branch 'master' of github.com:silver-bullet/boobsquare

Conflicts:
	app/models/user.rb
	app/views/devise/registrations/.new.html.erb.swp
	app/views/devise/registrations/new.html.erb
Merge branch 'master' of github.com:silver-bullet/boobsquare

Conflicts:
	app/models/user.rb
	app/views/devise/registrations/new.html.erb
Merge branch 'master' of github.com:silver-bullet/boobsquare

Conflicts:
	app/views/devise/registrations/new.html.erb
paperclip integration
Merge branch 'master' of github.com:silver-bullet/boobsquare