Added ng-models to inputs
merge