added angularjs...
merged