restructured rails data passed to angular
conformed angular ctrlr + views to new data structure
corrected oversight in rails model
edited search variable to match new data structure
search bar cleared upon return to dashboard
fixed merge conflicts