"Protiva changes.. Weights database"
"Merging mine and Protiva's project"
Merge branch 'master' of https://github.com/Protiva/heal

Conflicts:
	app/controllers/users_controller.rb~
	db/development.sqlite3