aanpassing measurements
Merge branch 'master' of https://github.com/Minkey27/Week-3-WAD

Conflicts:
	Energy/app/controllers/measurement_controller.rb
	Energy/app/models/residence.rb
	Energy/app/views/measurement/index.html.erb
Merge branch 'master' of https://github.com/Minkey27/Week-3-WAD

Conflicts:
	Energy/app/models/measurement.rb