"Unit of measure" and "Rationale inputBoxes were added
 "Unit of measure" and "Rationale inputBoxes were added
 "Unit of measure" and "Rationale inputBoxes were added
Merge branch 'master' of github.com:magnli10/inf5750-debe
 "Unit of measure" and "Rationale inputBoxes were added
Update controllers and ng-model in list.html
Finish view and controller with ng-Model
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/controllers.js
	js/services.js
	partials/list.html