Changes to weight/height in fields
Merge branch 'master' of https://github.com/forwarddynamic/BrowerClubAppTest

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