added angularjs functionality
added angularjs functionality
merging