added angular
fixed merge conflic
added separate js file